From d24038176c0a3033841f09fb65f6d7134e32af00 Mon Sep 17 00:00:00 2001 From: Rui Morais Date: Fri, 25 Feb 2022 14:34:11 +0000 Subject: [PATCH 1/3] Update sbt to 1.6.2 --- rac-gcp-deploy/executor/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rac-gcp-deploy/executor/Dockerfile b/rac-gcp-deploy/executor/Dockerfile index d22627de..35787b4f 100644 --- a/rac-gcp-deploy/executor/Dockerfile +++ b/rac-gcp-deploy/executor/Dockerfile @@ -2,13 +2,13 @@ ARG GCLOUD_SDK_VERSION FROM google/cloud-sdk:${GCLOUD_SDK_VERSION:-328.0.0-alpine} ARG SBT_VERSION -ENV SBT_VERSION ${SBT_VERSION:-1.4.7} +ENV SBT_VERSION ${SBT_VERSION:-1.6.2} RUN apk --update add openjdk8 jq RUN set -x \ && apk --update add --no-cache --virtual .build-deps curl \ - && ESUM="c2a759fe40a3c21a16b5a88d00cd66f3af6f0721e4ea61b63942dfb83a2d54fd" \ + && ESUM="637637b6c4e6fa04ab62cd364061e32b12480b09001cd23303df62b36fadd440" \ && SBT_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" \ && apk add shadow \ && apk add bash \ From 3423b1d0120072caae5a023f61ad35e9672bd817 Mon Sep 17 00:00:00 2001 From: Rui Morais Date: Fri, 25 Feb 2022 14:34:38 +0000 Subject: [PATCH 2/3] Update to jdk11 --- rac-gcp-deploy/executor/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rac-gcp-deploy/executor/Dockerfile b/rac-gcp-deploy/executor/Dockerfile index 35787b4f..d1acefd8 100644 --- a/rac-gcp-deploy/executor/Dockerfile +++ b/rac-gcp-deploy/executor/Dockerfile @@ -4,7 +4,7 @@ FROM google/cloud-sdk:${GCLOUD_SDK_VERSION:-328.0.0-alpine} ARG SBT_VERSION ENV SBT_VERSION ${SBT_VERSION:-1.6.2} -RUN apk --update add openjdk8 jq +RUN apk --update add openjdk11 RUN set -x \ && apk --update add --no-cache --virtual .build-deps curl \ From 1afaf2f80e8b8cf8765100cbcaae36e4df2f1f74 Mon Sep 17 00:00:00 2001 From: Rui Morais Date: Fri, 25 Feb 2022 14:36:23 +0000 Subject: [PATCH 3/3] Add orb version file --- rac-gcp-deploy/orb_version.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 rac-gcp-deploy/orb_version.txt diff --git a/rac-gcp-deploy/orb_version.txt b/rac-gcp-deploy/orb_version.txt new file mode 100644 index 00000000..a81c0209 --- /dev/null +++ b/rac-gcp-deploy/orb_version.txt @@ -0,0 +1 @@ +ovotech/rac-gcp-deploy@1.1.0