Skip to content

Commit 93b9440

Browse files
committed
fix(docker-go-dev): fix build error
1 parent ba0ce76 commit 93b9440

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

rootfs/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:20.04
33
LABEL name="drycc-go-dev"
44

55
ENV AZCLI_VERSION=2.9.1 \
6-
DOCKER_VERSION=18.09 \
6+
DOCKER_VERSION=19.03.9 \
77
GO_VERSION=1.14.6 \
88
KUBECTL_VERSION=v1.18.6 \
99
SHELLCHECK_VERSION=v0.7.1 \
@@ -45,7 +45,7 @@ RUN \
4545
vim \
4646
wget \
4747
zip \
48-
&& wget https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
48+
&& wget https://github.com/koalaman/shellcheck/releases/download/$SHELLCHECK_VERSION/shellcheck-$SHELLCHECK_VERSION.linux.x86_64.tar.xz \
4949
&& xz -d shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
5050
&& tar -xvf shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar \
5151
&& cp shellcheck-${SHELLCHECK_VERSION}/shellcheck /usr/local/bin/ \
@@ -57,12 +57,11 @@ RUN \
5757
&& curl -sSL https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
5858
&& chmod +x /usr/local/bin/kubectl \
5959
&& mkdir -p /go/bin \
60-
&& curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
6160
&& apt-get update && apt-get -f -y install \
62-
&& curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION-ce.tgz \
63-
&& tar xzvf docker-$DOCKER_VERSION-ce.tgz -C /usr/local/bin \
61+
&& curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz \
62+
&& tar xzvf docker-$DOCKER_VERSION.tgz -C /usr/local/bin \
6463
&& chmod +x -R /usr/local/bin/docker \
65-
&& rm docker-17.05.0-ce.tgz \
64+
&& rm docker-$DOCKER_VERSION.tgz \
6665
&& curl -L https://github.com/coreos/etcd/releases/download/$ETCDCTL_VERSION/etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz -o /tmp/etcd-$ETCDCTL_VERSION.tar.gz \
6766
&& tar -C /tmp -xvzf /tmp/etcd-$ETCDCTL_VERSION.tar.gz --strip-components=1 etcd-$ETCDCTL_VERSION-linux-amd64/etcdctl \
6867
&& mv /tmp/etcdctl /usr/local/bin/etcdctl \

0 commit comments

Comments
 (0)