Merge pull request #91: Name the final stage explicitly, move scripts, other minor refactoring

Author: victorlin

Dockerfile

@@ -81,16 +81,16 @@ RUN pip3 install google-cloud-storage==2.1.0
 ARG CACHE_DATE
 
 # Add helpers for build
-COPY devel/download-repo devel/latest-augur-release-tag /devel/
+COPY builder-scripts/download-repo builder-scripts/latest-augur-release-tag /builder-scripts/
 
 # Fauna
-RUN /devel/download-repo https://github.com/nextstrain/fauna master /nextstrain/fauna
+RUN /builder-scripts/download-repo https://github.com/nextstrain/fauna master /nextstrain/fauna
 
 # Augur
-RUN /devel/download-repo https://github.com/nextstrain/augur "$(/devel/latest-augur-release-tag)" /nextstrain/augur
+RUN /builder-scripts/download-repo https://github.com/nextstrain/augur "$(/builder-scripts/latest-augur-release-tag)" /nextstrain/augur
 
 # Auspice
-RUN /devel/download-repo https://github.com/nextstrain/auspice release /nextstrain/auspice
+RUN /builder-scripts/download-repo https://github.com/nextstrain/auspice release /nextstrain/auspice
 
 # Install Fauna deps
 RUN pip3 install --requirement=/nextstrain/fauna/requirements.txt
@@ -133,7 +133,7 @@ RUN cd /nextstrain/auspice && npm update && npm install && npm run build && npm
 # ———————————————————————————————————————————————————————————————————— #
 
 # Now build the final image.
-FROM python:3.7-slim-buster
+FROM python:3.7-slim-buster AS final
 
 # Add system runtime deps
 RUN apt-get update && apt-get install -y --no-install-recommends \

devel/download-repo builder-scripts/download-repodevel/download-repo renamed to builder-scripts/download-repo

@@ -39,32 +39,33 @@ if ! docker buildx inspect "$builder" &>/dev/null; then
     docker buildx create --name "$builder" --driver docker-container
 fi
 
-BASE_IMAGE="nextstrain/base"
-BASE_BUILDER_IMAGE="nextstrain/base-builder"
+BUILDER_IMAGE=nextstrain/base-builder
+FINAL_IMAGE=nextstrain/base
 
 docker buildx build \
+    --target builder \
     --builder "$builder" \
-    --platform $platform \
+    --platform "$platform" \
     --build-arg CACHE_DATE \
     --build-arg GIT_REVISION \
-    --cache-from $BASE_BUILDER_IMAGE:latest \
-    --cache-from $BASE_BUILDER_IMAGE:$tag \
+    --cache-from "$BUILDER_IMAGE:latest" \
+    --cache-from "$BUILDER_IMAGE:$tag" \
     --cache-to type=inline \
-    --tag $BASE_BUILDER_IMAGE:$tag \
+    --tag "$BUILDER_IMAGE:$tag" \
     --load \
-    --target builder \
     .
 
 docker buildx build \
+    --target final \
     --builder "$builder" \
-    --platform $platform \
+    --platform "$platform" \
     --build-arg CACHE_DATE \
     --build-arg GIT_REVISION \
-    --cache-from $BASE_BUILDER_IMAGE:latest \
-    --cache-from $BASE_BUILDER_IMAGE:$tag \
-    --cache-from $BASE_IMAGE:latest \
-    --cache-from $BASE_IMAGE:$tag \
+    --cache-from "$BUILDER_IMAGE:latest" \
+    --cache-from "$BUILDER_IMAGE:$tag" \
+    --cache-from "$FINAL_IMAGE:latest" \
+    --cache-from "$FINAL_IMAGE:$tag" \
     --cache-to type=inline \
-    --tag $BASE_IMAGE:$tag \
+    --tag "$FINAL_IMAGE:$tag" \
     --load \
     .

devel/latest-augur-release-tag builder-scripts/latest-augur-release-tagdevel/latest-augur-release-tag renamed to builder-scripts/latest-augur-release-tag

@@ -14,17 +14,17 @@ if [[ $# -eq 0 ]]; then
     set -- latest
 fi
 
-BASE_IMAGE="nextstrain/base"
-BASE_BUILDER_IMAGE="nextstrain/base-builder"
+BUILDER_IMAGE=nextstrain/base-builder
+FINAL_IMAGE=nextstrain/base
 
 for tag in "$@"; do
-    if [[ $(docker image inspect --format "{{.RepoDigests}}" $BASE_IMAGE:$tag) != '[]' || $(docker image inspect --format "{{.RepoDigests}}" $BASE_BUILDER_IMAGE:$tag) != '[]' ]]; then
-        echo "At least one of $BASE_IMAGE:$tag and $BASE_BUILDER_IMAGE:$tag has already been pushed. This can happen if the newly built image is not available in the local registry." >&2
+    if [[ $(docker image inspect --format "{{.RepoDigests}}" $BUILDER_IMAGE:$tag) != '[]' || $(docker image inspect --format "{{.RepoDigests}}" $FINAL_IMAGE:$tag) != '[]' ]]; then
+        echo "At least one of $BUILDER_IMAGE:$tag and $FINAL_IMAGE:$tag has already been pushed. This can happen if the newly built image is not available in the local registry." >&2
         exit 1
     fi
 done
 
 for tag in "$@"; do
-    docker push $BASE_BUILDER_IMAGE:$tag
-    docker push $BASE_IMAGE:$tag
+    docker push "$BUILDER_IMAGE:$tag"
+    docker push "$FINAL_IMAGE:$tag"
 done

devel/build

@@ -10,10 +10,10 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
-tag=$1
+tag="$1"
 
-BASE_IMAGE="nextstrain/base"
-BASE_BUILDER_IMAGE="nextstrain/base-builder"
+BUILDER_IMAGE=nextstrain/base-builder
+FINAL_IMAGE=nextstrain/base
 
-docker tag $BASE_BUILDER_IMAGE:{$tag,latest}
-docker tag $BASE_IMAGE:{$tag,latest}
+docker tag "$BUILDER_IMAGE":{"$tag",latest}
+docker tag "$FINAL_IMAGE":{"$tag",latest}