You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sm...@apache.org on 2019/05/21 17:32:26 UTC
[geode] branch develop updated: Keep newest packer but install
specific version as well. (#3611)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new bb8bf53 Keep newest packer but install specific version as well. (#3611)
bb8bf53 is described below
commit bb8bf53953bce591427c578bf61335630d4490fc
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Tue May 21 10:32:04 2019 -0700
Keep newest packer but install specific version as well. (#3611)
Authored-by: Sean Goller <sg...@pivotal.io>
---
ci/images/alpine-tools/Dockerfile | 3 ++-
ci/images/google-windows-geode-builder/build_image.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile
index 2cc5992..bc08fc2 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -16,7 +16,8 @@
FROM openjdk:8-jdk-alpine
COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk
-COPY --from=hashicorp/packer:1.3.5 /bin/packer /usr/local/bin/packer
+COPY --from=hashicorp/packer:latest /bin/packer /usr/local/bin/packer
+COPY --from=hashicorp/packer:1.3.5 /bin/packer /usr/local/bin/packer135
ENV PATH /google-cloud-sdk/bin:$PATH
RUN apk --no-cache add \
bash \
diff --git a/ci/images/google-windows-geode-builder/build_image.sh b/ci/images/google-windows-geode-builder/build_image.sh
index 7664642..8f4470b 100755
--- a/ci/images/google-windows-geode-builder/build_image.sh
+++ b/ci/images/google-windows-geode-builder/build_image.sh
@@ -49,7 +49,7 @@ fi
HASHED_PIPELINE_PREFIX="i$(uuidgen -n @dns -s -N "${PIPELINE_PREFIX}")-"
echo "Running packer"
-PACKER_LOG=1 packer build \
+PACKER_LOG=1 packer135 build \
--var "geode_docker_image=${GEODE_DOCKER_IMAGE}" \
--var "pipeline_prefix=${PIPELINE_PREFIX}" \
--var "hashed_pipeline_prefix=${HASHED_PIPELINE_PREFIX}" \