diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42859c697982d7841cfb17bda91ce1af2bec728b..6a91f6a1d4c2cec6380db46edd9a30af735c9aef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,8 @@ build_docker_image: 'ansible --version && openstack --version && packer version && - s3cmd --version' + s3cmd --version && + terraform --version' - docker push --all-tags $CI_REGISTRY_IMAGE rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" diff --git a/Dockerfile b/Dockerfile index 21f3a7fd8894e2d64e60c53c176e7d6b30109d23..be481fc5693df9930e79af337f426fa0e4555b3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,19 @@ FROM python:3.8-slim ENV S3CMD_VER=2.3.0 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 \ curl \ + wget \ + unzip \ && rm -rf /var/lib/apt/lists/* +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 RUN pip install --no-cache-dir --upgrade pip \ && pip install --no-cache-dir \ s3cmd==$S3CMD_VER \