Skip to content

Commit 0fda0ec

Browse files
authored
Merge pull request #29 from codacy/bump/upgrade-alpine-version
breaking: Upgrade ci-base to bump alpine version
2 parents 9c0465f + 7233e2a commit 0fda0ec

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*~
2+
.*.swp

Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM codacy/ci-base:1.0.1
2-
3-
LABEL maintainer="Codacy <[email protected]>"
1+
FROM codacy/ci-base:3.0.0
42

53
ENV TERRAFORM_VERSION=0.13.2
64
ENV HELM_VERSION=v3.2.1
7-
ENV HELM_SSM_VERSION=1.0.3
5+
ENV HELM_SSM_VERSION=3.1.0
6+
ENV HELM_PUSH_VERSION=0.9.0
87
ENV KUBECTL_VERSION=v1.16.2
98
ENV DOCTL_VERSION=1.33.1
10-
ENV PYTHON3_VERSION=3.6.9-r1
9+
ENV PYTHON3_VERSION=3.9.7-r4
1110
ENV PIP_VERSION=19.3.1
1211
ENV SETUPTOOLS_VERSION=41.4.0
1312

@@ -16,18 +15,17 @@ COPY requirements.pip .
1615
ADD https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip ./
1716
ADD https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS ./
1817

19-
RUN apk add --no-cache python3==${PYTHON3_VERSION} && \
20-
pip3 install --upgrade pip==${PIP_VERSION} setuptools==${SETUPTOOLS_VERSION} && \
21-
pip3 --no-cache-dir install -r requirements.pip && \
22-
sed -i '/.*linux_amd64.zip/!d' terraform_${TERRAFORM_VERSION}_SHA256SUMS
23-
RUN sed -i '/.*linux_amd64.zip/!d' terraform_${TERRAFORM_VERSION}_SHA256SUMS && \
18+
RUN apk add --no-cache python3==${PYTHON3_VERSION} py3-pip && \
19+
pip install --upgrade pip==${PIP_VERSION} setuptools==${SETUPTOOLS_VERSION} && \
20+
pip --no-cache-dir install -r requirements.pip && \
21+
sed -i '/.*linux_amd64.zip/!d' terraform_${TERRAFORM_VERSION}_SHA256SUMS && \
2422
sha256sum -cs terraform_${TERRAFORM_VERSION}_SHA256SUMS && \
2523
unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /bin && \
2624
curl -L "https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz" | tar -zxf - && \
2725
mv linux-amd64/helm /usr/local/bin/helm && \
2826
chmod +x /usr/local/bin/helm && \
2927
helm plugin install https://github.com/codacy/helm-ssm/releases/download/${HELM_SSM_VERSION}/helm-ssm-linux.tgz && \
30-
helm plugin install https://github.com/chartmuseum/helm-push && \
28+
helm plugin install https://github.com/chartmuseum/helm-push --version ${HELM_PUSH_VERSION} && \
3129
helm plugin install https://github.com/codacy/helm-poll/releases/download/latest/helm-poll-linux.tgz && \
3230
helm repo add codacy-stable https://charts.codacy.com/stable/ && \
3331
curl -Lo /usr/local/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \

0 commit comments

Comments
 (0)