use specific tags in dockerfiles, clean up docker containers afterwards

buildkite/common

@@ -14,4 +14,3 @@ else
 fi
 
 BUILD_ENV_TAG=$ORG/montagu-portal-shared-build-env:$GIT_SHA
-BUILD_ENV_NAME=montagu-portal-shared-build-env

buildkite/make-integration-tests-image.sh

@@ -11,11 +11,11 @@ TAG_BRANCH=$NAME:$GIT_BRANCH
 # In case we switch agents between steps
 [ ! -z $(docker images -q $BUILD_ENV_TAG) ] || docker pull $BUILD_ENV_TAG
 
-# We build a docker image that inherits from the latest build env image
-# so here tag the image with the name used in the dockerfile
-docker tag $BUILD_ENV_TAG $BUILD_ENV_NAME
+docker build -f ./docker/integration-tests.dockerfile \
+        -t $TAG_SHA \
+        --build-arg MONTAGU_GIT_ID=$GIT_SHA \
+        .
 
-docker build -f ./docker/integration-tests.dockerfile -t $TAG_SHA .
 docker tag $TAG_SHA $TAG_BRANCH
 docker push $TAG_SHA
 docker push $TAG_BRANCH

buildkite/pipeline.yml

@@ -9,3 +9,9 @@ steps:
 
   - label: ":construction_worker: Build and push integration test image"
     command: buildkite/make-integration-tests-image.sh
+
+  - wait
+
+  - label: ":hammer: Stop dependencies"
+    command: app/scripts/clear-docker.sh
+    allow_dependency_failure: true

buildkite/run-build.sh

@@ -3,21 +3,17 @@ set -ex
 HERE=$(dirname $0)
 . $HERE/common
 
-PORTAL_BUILD_ENV=montagu-portal-build-env
+PORTAL_BUILD_ENV=montagu-portal-build-env:$GIT_SHA
 
 ./$HERE/../app/scripts/run-dependencies.sh
 ./$HERE/../app/scripts/add-test-accounts-for-integration-tests.sh
 
 # In case we switch agents between steps
 [ ! -z $(docker images -q $BUILD_ENV_TAG) ] || docker pull $BUILD_ENV_TAG
 
-# We build a docker image that inherits from the latest build env image
-# so here tag the image with the name used in the dockerfile
-docker tag $BUILD_ENV_TAG $BUILD_ENV_NAME
-
 # The main build env which builds and tests below
 docker build -f ./docker/build.dockerfile \
-    -t $PORTAL_BUILD_ENV:$GIT_SHA \
+    -t $PORTAL_BUILD_ENV \
     --build-arg MONTAGU_GIT_ID=$GIT_SHA \
     --build-arg MONTAGU_GIT_BRANCH=$GIT_BRANCH \
     .
@@ -30,4 +26,4 @@ docker run \
     -v $docker_auth_path:/root/.docker/config.json \
     -v /var/run/docker.sock:/var/run/docker.sock \
     --network=host \
-   $PORTAL_BUILD_ENV:$GIT_SHA
+   $PORTAL_BUILD_ENV

docker/build-images.sh

@@ -3,7 +3,7 @@ set -e
 
 git_branch=$1
 git_id=$2
-registry=docker.montagu.dide.ic.ac.uk:5000
+org=vimc
 contrib_name=montagu-contrib-portal
 admin_name=montagu-admin-portal
 
@@ -26,8 +26,8 @@ function build {
     app_name=$2
     echo "Building $app_name portal image"
     docker build -f docker/run.dockerfile \
-        -t $registry/$image_name:$git_id \
-        -t $registry/$image_name:$git_branch \
+        -t $org/$image_name:$git_id \
+        -t $org/$image_name:$git_branch \
         --build-arg APP_NAME=$app_name \
         .
 }
@@ -41,7 +41,7 @@ function push {
 	docker push $id
 }
 
-push $registry/$contrib_name:$git_id
-push $registry/$contrib_name:$git_branch
-push $registry/$admin_name:$git_id
-push $registry/$admin_name:$git_branch
+push $org/$contrib_name:$git_id
+push $org/$contrib_name:$git_branch
+push $org/$admin_name:$git_id
+push $org/$admin_name:$git_branch

docker/build.dockerfile

@@ -1,4 +1,5 @@
-FROM montagu-portal-shared-build-env
+ARG MONTAGU_GIT_ID="UNKNOWN"
+FROM vimc/montagu-portal-shared-build-env:$MONTAGU_GIT_ID
 
 ARG MONTAGU_GIT_ID="UNKNOWN"
 ARG MONTAGU_GIT_BRANCH="UNKNOWN"

docker/integration-tests.dockerfile

@@ -1,3 +1,5 @@
-FROM montagu-portal-shared-build-env
+ARG MONTAGU_GIT_ID="UNKNOWN"
+
+FROM vimc/montagu-portal-shared-build-env:$MONTAGU_GIT_ID
 
 ENTRYPOINT ["./scripts/run-integration-tests-in-container.sh"]