Skip to content

Commit

Permalink
Merge pull request #277 from kubernetes-simulator/fix-tf-version
Browse files Browse the repository at this point in the history
fix: tf bundle version
  • Loading branch information
s-irvine authored Aug 4, 2020
2 parents d86d4b1 + 129dc82 commit 3510e97
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ ENV PATH $PATH:/usr/local/go/bin
# Install terraform
ENV GOPATH /go
ENV PATH $PATH:/go/bin

ENV GO111MODULE on
RUN mkdir -p /go/ && \
chdir /go && \
go get -d -v github.com/hashicorp/terraform && \
go install ./src/github.com/hashicorp/terraform/tools/terraform-bundle
go get github.com/hashicorp/terraform/tools/[email protected]

COPY ./terraform/deployments/AWS/terraform-bundle.hcl .
RUN terraform-bundle package terraform-bundle.hcl && \
mkdir -p terraform-bundle && \
Expand Down Expand Up @@ -93,18 +94,17 @@ COPY --chown=1000 launch-files/bashrc /app/launch-files/bashrc

USER ${lint_user}

# Lint Dockerfiles
RUN hadolint Dockerfile \
&& hadolint attack/Dockerfile \
# Lint shell scripts
&& shellcheck scripts/* \
&& shellcheck attack/scripts/* \
&& shellcheck simulation-scripts/perturb.sh \
&& shellcheck kubesim \
&& shellcheck Bastion/bashrc \
&& shellcheck InternalHost/bashrc \
&& shellcheck Kubernetes/bashrc \
&& shellcheck launch-files/bashrc
# Lint Dockerfiles & shell scripts
RUN hadolint Dockerfile && \
hadolint attack/Dockerfile && \
shellcheck scripts/* && \
shellcheck attack/scripts/* && \
shellcheck simulation-scripts/perturb.sh && \
shellcheck kubesim && \
shellcheck Bastion/bashrc && \
shellcheck InternalHost/bashrc && \
shellcheck Kubernetes/bashrc && \
shellcheck launch-files/bashrc

WORKDIR /app/scenario-tools

Expand Down

0 comments on commit 3510e97

Please sign in to comment.