@@ -3,18 +3,18 @@ FROM ubuntu:18.04
33LABEL name="deis-go-dev" \
44 maintainer="Matt Boersma <matt.boersma@microsoft.com>"
55
6- ENV AZCLI_VERSION=2.0.79 \
6+ ENV AZCLI_VERSION=2.3.1 \
77 DOCKER_VERSION=19.03.4 \
8- GO_VERSION=1.13.5 \
8+ GO_VERSION=1.14.2 \
99 GLIDE_VERSION=v0.13.3 \
1010 GLIDE_HOME=/root \
11- HELM_VERSION=v2.14 .3 \
11+ HELM_VERSION=v2.16 .3 \
1212 KUBECTL_VERSION=v1.16.3 \
1313 ETCDCTL_VERSION=v3.1.8 \
14- GOLANGCI_LINT_VERSION=v1.22.2 \
14+ GOLANGCI_LINT_VERSION=v1.24.0 \
1515 PROTOBUF_VERSION=3.7.0 \
1616 SHELLCHECK_VERSION=v0.7.0 \
17- SHFMT_VERSION=3.0 .0 \
17+ SHFMT_VERSION=3.1 .0 \
1818 PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/local/bin/docker \
1919 GOPATH=/go
2020
@@ -47,10 +47,10 @@ RUN \
4747 netcat \
4848 openssh-client \
4949 procps \
50- python \
51- python -dev \
52- python -pip \
53- python -setuptools \
50+ python3 \
51+ python3 -dev \
52+ python3 -pip \
53+ python3 -setuptools \
5454 rsync \
5555 ruby \
5656 unzip \
@@ -105,11 +105,10 @@ RUN \
105105 && curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ${GOPATH}/bin ${GOLANGCI_LINT_VERSION} \
106106 && curl -o /usr/local/bin/shellcheck -sSL https://shellcheck.storage.googleapis.com/shellcheck-${SHELLCHECK_VERSION}.linux-x86_64 \
107107 && chmod +x /usr/local/bin/shellcheck \
108- && go get -u mvdan.cc/sh/cmd/shfmt \
109- && git -C "$GOPATH/src/mvdan.cc/sh" checkout -q "v$SHFMT_VERSION" \
110- && go install -a -ldflags '-extldflags "-static"' mvdan.cc/sh/cmd/shfmt \
111- && pip install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} shyaml \
112- && apt-get purge --auto-remove -y libffi-dev python-dev python-pip \
108+ && curl -o /usr/local/bin/shfmt -sSL https://github.com/mvdan/sh/releases/download/v{SHFMT_VERSION}/shfmt_v{SHFMT_VERSION}_linux_amd64 \
109+ && chmod +x /usr/local/bin/shfmt \
110+ && pip3 install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} shyaml \
111+ && apt-get purge --auto-remove -y libffi-dev python3-dev python3-pip \
113112 && apt-get autoremove -y \
114113 && apt-get clean -y \
115114 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc ${GOPATH}/pkg/* ${GOPATH}/src/* /root/cache /root/.cache \
0 commit comments