Merge ~ballot/charm-k8s-postgresql/+git/charm-k8s-postgresql:ballot_review into charm-k8s-postgresql:master

[Stuart Bishop]

Remove useless makefile target

Also, allow variables to be passed as environment variables

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Stuart Bishop (stub)]

Yup, all good.

Waiting on https://code.launchpad.net/~stub/charm-k8s-postgresql/+git/charm-k8s-postgresql/+merge/390835 before this can land

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change cannot be self approved, setting status to needs review.

[Tom Haddon (mthaddon)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change must be approved by a member of one of the following teams:
 - postgresql-charmers
Setting status to needs review.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change cannot be self approved, setting status to needs review.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change has no commit message, setting status to needs review.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 12b6c22c1d621b1b6693c649f71eb2860e5b75b3

diff --git a/Makefile b/Makefile
index 40ffda9..1bfa93a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,13 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PG_MAJOR := 12
-DIST_RELEASE := focal
+PG_MAJOR ?= 12
+DIST_RELEASE ?= focal
 
-IMAGE_REGISTRY :=
-IMAGE_NAME := pgcharm
-IMAGE_TAG := latest
-NO_CACHE :=
+IMAGE_REGISTRY ?=
+IMAGE_NAME ?= pgcharm
+IMAGE_TAG ?= latest
+NO_CACHE ?=
 # NO_CACHE := --no-cache
 
 REGISTRY_IMAGE := $(IMAGE_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
@@ -47,16 +47,7 @@ clean:
 postgresql.charm: src/*.py requirements.txt *.yaml .jujuignore
 	charmcraft build
 
-image-deps:
-	@echo "Checking shellcheck is present."
-	@command -v shellcheck >/dev/null || { echo "Please install shellcheck to continue ('sudo snap install shellcheck')" && false; }
-
-image-lint: image-deps
-	@echo "Running shellcheck."
-	shellcheck files/docker-entrypoint.sh
-	shellcheck files/docker-readyness.sh
-
-image-build: image-lint
+image-build:
 	@echo "Building the $(LOCAL_IMAGE) image"
 	docker build $(NO_CACHE) -t $(LOCAL_IMAGE) --build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') .