diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a91f6a1d4c2cec6380db46edd9a30af735c9aef..4090b8d90b7265ed7f3882d43ee7e8b64ea69ba4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,6 @@ variables: GIT_AUTHOR_EMAIL: "gitlab@runner" NUM_SERVER_TO_KEEP: 5 NUM_IMAGE_TO_KEEP: 30 - PACKER_VER: 1.8.3 PKR_VAR_root_ssh_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAFqqWgmYpEaGtHBeTu27ntVJpYjwq/x5aBefrvfhk8Z9lE3cuZ26vJ9n/9tGE4Zn2Pew1mpZgi6PzfJ3vMt8yA= root@master" DEV_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpncAcYosVHt7HsUcE2XOYDuCi4HQnmFJv279LOcpZgXtZ6o0BM1fe5FgJS0X1ohBXQUFRuYJuJSW/GSmC1K8T+wCrKjZLJdMbqrubHV27diUZfdoVkoJy1vcAQF5nEcoTC7MpAFbBomdn2rsrpgQe8DGiURV7+soqybXV1OsIR3FFf6npnUaskHYT/oVtG9eBOnscyBxoVgbxzlmyoBLXED/sHKFw4nQSF/glYKEFiDu6TRTsBBEGvv23Qo/66QpQiFJ6TNfApNiyY9L1X+Dy8EWU6lozmNgwGDjXQ70Lr6xHnA0QGVALJlHXa6QjpgtpC5Nefsdvtf1hpfFo2VutpbSB+aq9jk3gWNN+XkhrWN5PiwP7YYJNw/WozyfL+IhwjfHZGxkuws+wGR6ZKxlX9W9Vrsq9ncYNKuhy2SdsR6s2XECQtrEQ6ZlX5jRt6Yh5M9ls5fMsWEqknDPmr1Ui6wV7NxprYngo9fLSdYO/ETIO3S6PB0aEHOZOyGitGaM06EmNpvjQn/QkkaVgt/O8wKL1o1AVzXhDMAFvtG6ejppV6kuTUHXFgSGZF6N9fnP91HuytyzC09F+NMWcmnRdrgXlHapjuuL3zzi+XLCQvk8+aYTzBKx1nU2FPMDRZ9sInGmqdTuM002E7qVbaCy4OxcWaAS/L2UVhGnHr+egYw== louistw@uab.edu" @@ -50,10 +49,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..3be4c924c183203ab9c0927a93d5ec57856e4cf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ ENV S3CMD_VER=2.3.0 ENV ANSIBLE_VER=4.10.0 ENV OSC_VER=5.8.0 ENV TF_VER=1.4.6 +ENV PACKER_VER=1.8.3 -ADD ./packer /usr/local/bin RUN apt-get update && apt-get install --no-install-recommends -y \ git \ ssh \ @@ -13,6 +13,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