Skip to content

Commit

Permalink
solve all issues found by trivy
Browse files Browse the repository at this point in the history
  • Loading branch information
lonegunmanb committed May 14, 2024
1 parent a5c5a39 commit 78e1b04
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 39 deletions.
75 changes: 38 additions & 37 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ RUN cd /src && \
cd /src && \
go install github.com/lonegunmanb/previousTag@latest && \
go install github.com/magodo/hclgrep@latest && \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH || $GOPATH)/bin $GOLANGCI_LINT_VERSION && \
# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH || $GOPATH)/bin $GOLANGCI_LINT_VERSION && \
go install github.com/golangci/golangci-lint/cmd/golangci-lint@$GOLANGCI_LINT_VERSION && \
go install github.com/lonegunmanb/avmfix@$AVMFIX_VERSION && \
go install github.com/lonegunmanb/yorbox@$YORBOX_VERSION && \
go install github.com/Azure/grept@$GREPT_VERSION && \
Expand Down Expand Up @@ -70,39 +71,39 @@ RUN cd /src && \
git checkout $TFENV && \
rm -rf .git

#FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 as runner
#ARG GOLANG_IMAGE_TAG=1.19
#ARG TERRAFORM_VERSION=1.3.3
#ARG TARGETARCH
#ARG PACKER_VERSION=1.9.4
#ARG TFSEC_VERSION=v1.28.4
#ARG TFLINT_VERSION=v0.41.0
#ENV TFLINT_PLUGIN_DIR /home/runtimeuser/tflint
#ENV GOROOT=/usr/local/go
#ENV GOPATH=/home/runtimeuser/go
#ENV PATH=$PATH:/home/runtimeuser/tfenv/bin:/pkenv/bin:$GOROOT/bin:$GOPATH/bin
#ENV TFLINTENV_DEFAULT_VERSION=$TFLINT_VERSION
#ENV TFENV_AUTO_INSTALL=true
#ENV TFENV_TERRAFORM_VERSION=$TERRAFORM_VERSION
#ENV TF_CLI_CONFIG_FILE=/home/runtimeuser/.terraformrc
#RUN yum update -y && \
# yum install -y ca-certificates zip unzip jq python3-devel python3-pip make git less diffutils build-essential openssh-server wget && \
# tdnf install moby-cli ca-certificates -y && \
# pip3 install cryptography -U && \
# pip install azure-cli && \
# wget -q https://go.dev/dl/go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \
# tar -C /usr/local -xzf go*.linux-${TARGETARCH}.tar.gz && \
# rm go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \
# git config --global user.email "[email protected]" && \
# git config --global user.name "github-actions[bot]" && \
# git config --global --add safe.directory '*'
#RUN mkdir /home/runtimeuser && \
# chmod -R 777 /home/runtimeuser
#COPY .terraformrc /home/runtimeuser/.terraformrc
#COPY --from=build /go/bin /usr/local/go/bin
#COPY --from=build /src/tfenv /home/runtimeuser/tfenv
#RUN chmod 777 /home/runtimeuser/tfenv && \
# git clone https://github.com/iamhsa/pkenv.git /pkenv && \
# cd /pkenv && rm -rf .git && \
# rm -r /tmp/* && \
# yum clean all
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 as runner
ARG GOLANG_IMAGE_TAG=1.19
ARG TERRAFORM_VERSION=1.3.3
ARG TARGETARCH
ARG PACKER_VERSION=1.9.4
ARG TFSEC_VERSION=v1.28.4
ARG TFLINT_VERSION=v0.41.0
ENV TFLINT_PLUGIN_DIR /home/runtimeuser/tflint
ENV GOROOT=/usr/local/go
ENV GOPATH=/home/runtimeuser/go
ENV PATH=$PATH:/home/runtimeuser/tfenv/bin:/pkenv/bin:$GOROOT/bin:$GOPATH/bin
ENV TFLINTENV_DEFAULT_VERSION=$TFLINT_VERSION
ENV TFENV_AUTO_INSTALL=true
ENV TFENV_TERRAFORM_VERSION=$TERRAFORM_VERSION
ENV TF_CLI_CONFIG_FILE=/home/runtimeuser/.terraformrc
RUN yum update -y && \
yum install -y ca-certificates zip unzip jq python3-devel python3-pip make git less diffutils build-essential openssh-server wget && \
tdnf install moby-cli ca-certificates -y && \
pip3 install cryptography -U && \
pip install azure-cli && \
wget -q https://go.dev/dl/go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \
tar -C /usr/local -xzf go*.linux-${TARGETARCH}.tar.gz && \
rm go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \
git config --global user.email "[email protected]" && \
git config --global user.name "github-actions[bot]" && \
git config --global --add safe.directory '*'
RUN mkdir /home/runtimeuser && \
chmod -R 777 /home/runtimeuser
COPY .terraformrc /home/runtimeuser/.terraformrc
COPY --from=build /go/bin /usr/local/go/bin
COPY --from=build /src/tfenv /home/runtimeuser/tfenv
RUN chmod 777 /home/runtimeuser/tfenv && \
git clone https://github.com/iamhsa/pkenv.git /pkenv && \
cd /pkenv && rm -rf .git && \
rm -r /tmp/* && \
yum clean all
4 changes: 2 additions & 2 deletions version.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AVMFIX_VERSION=9c158444b055e845c0cc9afc7cdc88d0ab19e5eb
GOLANG_IMAGE_TAG=1.22.3
GOLANGCI_LINT_VERSION=v1.57.1
GOLANGCI_LINT_VERSION=v1.58.1
GOSEC_VERSION=v2.19.0
GREPT_VERSION=v0.1.1
HCLEDIT_VERSION=v0.2.10.1
Expand All @@ -11,7 +11,7 @@ TERRAFORM_DOCS_VERSION=v0.17.2
TERRAFORM_VERSION=1.8.2
TERRAGRUNT_VERSION=v0.58.4
TFENV=v3.0.0
TFLINT_VERSION=v0.50.4
TFLINT_VERSION=v0.50.3
TFMOD_TEST_HELPER_VERSION=v0.21.0
TFSEC_VERSION=v1.28.4
YOR_VERSION=0.1.171
Expand Down

0 comments on commit 78e1b04

Please sign in to comment.