diff --git a/atlantis/Dockerfile b/atlantis/Dockerfile index 42b0bb0..f4cf3af 100644 --- a/atlantis/Dockerfile +++ b/atlantis/Dockerfile @@ -1,15 +1,4 @@ ARG ATLANTIS_VERSION=v0.27.1 -FROM node:16 as node - -# Build dependencies -RUN \ - yarn global add inkdrop-visualizer pkg - -WORKDIR /usr/src/app - -RUN \ - pkg -o inkdrop "$(which inkdrop)" - FROM ghcr.io/runatlantis/atlantis:${ATLANTIS_VERSION} AS tools USER root ARG GOSU_VERSION=1.17 @@ -20,7 +9,7 @@ RUN \ chmod +x /usr/local/bin/gosu # Install infracost -ARG INFRACOST_VERSION=v0.10.32 +ARG INFRACOST_VERSION=v0.10.33 RUN \ wget -q \ "https://github.com/infracost/infracost/releases/download/${INFRACOST_VERSION}/infracost-linux-amd64.tar.gz" \ @@ -39,6 +28,9 @@ RUN \ adduser -S atlantis -G atlantis && \ cp /root/.terraformrc /home/atlantis/ +RUN apk add --no-cache nodejs yarn \ + && yarn global add inkdrop-visualizer + ENV TF_PLUGIN_CACHE_DIR="/usr/share/terraform/providers" ENV ATLANTIS_TERRAFORM_VERSION=${TERRAFORM_VERSION} ENV DEFAULT_TERRAFORM_VERSION=$TERRAFORM_VERSION @@ -46,16 +38,13 @@ ENV TERRAGRUNT_TFPATH="terraform${TERRAFORM_VERSION}" ENV TF_PLUGIN_CACHE_MAY_BREAK_DEPENDENCY_LOCK_FILE=true ENV DEFAULT_CONFTEST_VERSION=0.35.0 -COPY atlantis-config.yaml /etc/atlantis/repos.yaml - +#COPY ./atlantis-config.yaml /etc/atlantis/repos.yaml COPY --from=tools /usr/local/bin/gosu /usr/local/bin/gosu COPY --from=tools /usr/local/bin/atlantis /usr/local/bin/atlantis COPY --from=tools /usr/bin/dumb-init /usr/local/bin/dumb-init COPY --from=tools /usr/local/bin/conftest /usr/local/bin/conftest COPY --from=tools /usr/local/bin/infracost /usr/local/bin/infracost -COPY --from=node /usr/src/app/inkdrop /usr/local/bin/inkdrop - COPY --from=tools /usr/bin/dumb-init /usr/bin/dumb-init COPY --from=tools /usr/local/bin/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh