diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a91f6a1d4c2cec6380db46edd9a30af735c9aef..9fd83164a1ce58bb16b6627bc925400e34516952 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,10 +50,6 @@ build_docker_image: - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d) - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: - - | - wget https://releases.hashicorp.com/packer/$PACKER_VER/packer_${PACKER_VER}_linux_amd64.zip -O packer.zip - unzip packer.zip - rm packer.zip - docker build -t $CI_REGISTRY_IMAGE:$BUILD_DATE -t $CI_REGISTRY_IMAGE:latest . - > docker run --rm $CI_REGISTRY_IMAGE bash -c diff --git a/Dockerfile b/Dockerfile index be481fc5693df9930e79af337f426fa0e4555b3d..8dec75eb9ab9353b28504b38ba29bd9e088e0d23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ ENV ANSIBLE_VER=4.10.0 ENV OSC_VER=5.8.0 ENV TF_VER=1.4.6 -ADD ./packer /usr/local/bin RUN apt-get update && apt-get install --no-install-recommends -y \ git \ ssh \ @@ -13,6 +12,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ wget \ unzip \ && rm -rf /var/lib/apt/lists/* +RUN wget https://releases.hashicorp.com/packer/${PACKER_VER}/packer_${PACKER_VER}_linux_amd64.zip \ + && unzip packer_${PACKER_VER}_linux_amd64.zip -d /usr/local/bin \ + && rm packer_${PACKER_VER}_linux_amd64.zip RUN wget https://releases.hashicorp.com/terraform/${TF_VER}/terraform_${TF_VER}_linux_amd64.zip \ && unzip terraform_${TF_VER}_linux_amd64.zip -d /usr/local/bin \ && rm terraform_${TF_VER}_linux_amd64.zip