Skip to content

Commit fccba9e

Browse files
authored
Merge pull request #5 from Cryptophobia/master
Updates from deis/docker-go-dev upstream
2 parents f357f79 + 0413d8a commit fccba9e

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

rootfs/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ FROM ubuntu:18.04
33
LABEL name="deis-go-dev" \
44
maintainer="Matt Boersma <matt.boersma@microsoft.com>"
55

6-
ENV AZCLI_VERSION=2.3.1 \
6+
ENV AZCLI_VERSION=2.5.1 \
77
DOCKER_VERSION=19.03.4 \
8-
GO_VERSION=1.14.2 \
8+
GO_VERSION=1.14.3 \
99
GLIDE_VERSION=v0.13.3 \
1010
GLIDE_HOME=/root \
1111
HELM_VERSION=v2.16.3 \
1212
KUBECTL_VERSION=v1.16.3 \
1313
ETCDCTL_VERSION=v3.1.8 \
14-
GOLANGCI_LINT_VERSION=v1.24.0 \
14+
GOLANGCI_LINT_VERSION=v1.27.0 \
1515
PROTOBUF_VERSION=3.7.0 \
16-
SHELLCHECK_VERSION=v0.7.0 \
17-
SHFMT_VERSION=3.1.0 \
16+
SHELLCHECK_VERSION=v0.7.1 \
17+
SHFMT_VERSION=3.1.1 \
1818
PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/local/bin/docker \
1919
GOPATH=/go
2020

@@ -103,12 +103,12 @@ RUN \
103103
&& ln -s ${GOPATH}/bin/gometalinter.v2 ${GOPATH}/bin/gometalinter \
104104
&& gometalinter.v2 --install \
105105
&& curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ${GOPATH}/bin ${GOLANGCI_LINT_VERSION} \
106-
&& curl -o /usr/local/bin/shellcheck -sSL https://shellcheck.storage.googleapis.com/shellcheck-${SHELLCHECK_VERSION}.linux-x86_64 \
107-
&& chmod +x /usr/local/bin/shellcheck \
106+
&& curl -sSL https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
107+
| tar -vxJ -C /usr/local/bin --strip=1 \
108108
&& curl -o /usr/local/bin/shfmt -sSL https://github.com/mvdan/sh/releases/download/v{SHFMT_VERSION}/shfmt_v{SHFMT_VERSION}_linux_amd64 \
109109
&& chmod +x /usr/local/bin/shfmt \
110110
&& 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 \
111+
&& apt-get purge --auto-remove -y libffi-dev python3-dev \
112112
&& apt-get autoremove -y \
113113
&& apt-get clean -y \
114114
&& 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

Comments
 (0)