Tweaks

Author: ljmnoonan

hooks/build

@@ -3,8 +3,8 @@ from plumbum import FG, local
 from plumbum.cmd import date, docker
 
 # Check environment variables are present
-BASE_TAG = local.env["BASE_TAG"]
 DOCKER_TAG = local.env["DOCKER_TAG"]
+BASE_TAG = local.env.get("BASE_TAG", DOCKER_TAG)
 REPO = local.env["DOCKER_REPO"]
 COMMIT = local.env.get("GIT_SHA1")
 DATE = date("--rfc-3339", "ns")

hooks/push

@@ -6,9 +6,7 @@ REGISTRY = local.env.get("REGISTRY_HOST", "docker.io")
 REPO = local.env["DOCKER_REPO"]
 SUFFIX = local.env.get("DOCKER_REPO_SUFFIX", "")
 VERSION = local.env["DOCKER_TAG"]
-
-PLATFORMS = local.env.get("DOCKER_PLATFORM")
-PG_VERSION = local.env.get("PG_VERSION", VERSION.split("-")[0])
+BASE_TAG = local.env.get("BASE_TAG", VERSION)
 GIT_SHA1 = local.env.get("GIT_SHA1", "")
 
 # Log all locally available images; will help to pin images
@@ -37,15 +35,15 @@ def tags_to_push():
     return tags
 
 
-if PLATFORMS:
+if local.env.get("DOCKER_PLATFORM"):
     BUILD_DATE = date("--rfc-3339", "ns")
     cmd = docker[
         "buildx",
         "build",
         "--platform",
-        PLATFORMS,
+        local.env["DOCKER_PLATFORM"],
         "--build-arg",
-        "BASE_TAG={}-alpine".format(PG_VERSION),
+        "BASE_TAG={}".format(BASE_TAG),
         "--build-arg",
         "VCS_REF={}".format(GIT_SHA1),
         "--build-arg",