Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit b1ba4da

Browse files
authored
Merge pull request #3045 from dweomer/docker/19.03.15
docker/19.03.15
2 parents fe1027b + ee2919c commit b1ba4da

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Dockerfile.dapper

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ARG SYSTEM_DOCKER_VERSION=17.06-ros6
8585
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
8686
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
8787

88-
ARG USER_DOCKER_VERSION=19.03.14
88+
ARG USER_DOCKER_VERSION=19.03.15
8989
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
9090

9191
ARG AZURE_SERVICE=false
@@ -158,7 +158,9 @@ RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \
158158
chmod +x /usr/bin/docker
159159

160160
# Install dapper
161-
RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \
161+
# sidestep https://github.com/rancher/dapper/issues/92 with v0.5.4
162+
ARG DAPPER_VERSION="v0.5.4"
163+
RUN curl -sL https://github.com/rancher/dapper/releases/download/${DAPPER_VERSION}/dapper-$(uname -s)-$(uname -m) > /usr/bin/dapper && \
162164
chmod +x /usr/bin/dapper
163165

164166
RUN cd ${DOWNLOADS} && \

0 commit comments

Comments
 (0)