From 0f6aa24626a7b25c5f28ba6308a65c068db32227 Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Tue, 2 Feb 2021 21:48:20 -0700 Subject: [PATCH 1/2] docker/19.03.15 - Bump user docker 19.03.15 Signed-off-by: Jacob Blain Christen --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index b0079209..18ba672d 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -85,7 +85,7 @@ ARG SYSTEM_DOCKER_VERSION=17.06-ros6 ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz -ARG USER_DOCKER_VERSION=19.03.14 +ARG USER_DOCKER_VERSION=19.03.15 ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION} ARG AZURE_SERVICE=false From ee2919cf0f2e9f9a213258e57d48d932135de610 Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Tue, 2 Feb 2021 21:54:49 -0700 Subject: [PATCH 2/2] pin dapper to v0.5.4 Sidestep https://github.com/rancher/dapper/issues/92 Signed-off-by: Jacob Blain Christen --- Dockerfile.dapper | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 18ba672d..312aafbc 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -158,7 +158,9 @@ RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \ chmod +x /usr/bin/docker # Install dapper -RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \ +# sidestep https://github.com/rancher/dapper/issues/92 with v0.5.4 +ARG DAPPER_VERSION="v0.5.4" +RUN curl -sL https://github.com/rancher/dapper/releases/download/${DAPPER_VERSION}/dapper-$(uname -s)-$(uname -m) > /usr/bin/dapper && \ chmod +x /usr/bin/dapper RUN cd ${DOWNLOADS} && \