set -ex, use tag for portal env

vimc · Jul 14, 2020 · 9c97865 · 9c97865
1 parent ab9d80f
commit 9c97865
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/buildkite/run-build.sh b/buildkite/run-build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 HERE=$(dirname $0)
 . $HERE/common
 
@@ -17,7 +17,7 @@ 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 \
+    -t $PORTAL_BUILD_ENV:$GIT_ID \
     --build-arg MONTAGU_GIT_ID=$GIT_SHA \
     --build-arg MONTAGU_GIT_BRANCH=$GIT_BRANCH \
     .
@@ -30,4 +30,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
+   $PORTAL_BUILD_ENV:$GIT_ID
diff --git a/docker/shared-build-env.dockerfile b/docker/shared-build-env.dockerfile
@@ -1,26 +1,4 @@
-FROM node:8-stretch
-
-# Install OpenJDK
-RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list
-RUN apt-get update
-RUN apt-get install -t stretch-backports -y \
-    openjdk-8-jdk
-RUN rm /etc/apt/sources.list.d/stretch-backports.list
-
-# Install docker
-RUN apt-get update
-RUN apt-get install -y \
-        apt-transport-https \
-        ca-certificates \
-        curl \
-        software-properties-common
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-RUN add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable"
-RUN apt-get update
-RUN apt-get install -y docker-ce=5:18.09.0~3-0~debian-stretch
+FROM vimc/node-docker-openjdk:master
 
 # Install Docker Compose
 RUN curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` \