From 6fd2695afb3aed82d2b414731a1e88216c88ea7b Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Tue, 19 May 2020 20:10:50 +0200
Subject: [PATCH 1/2] Add Docker 19.03.9

---
 d/docker-19.03.9.yml                       | 21 +++++++++++++++++++++
 images/10-docker-19.03.9/Dockerfile        |  2 ++
 images/10-docker-19.03.9/prebuild.sh       | 20 ++++++++++++++++++++
 images/10-docker-19.03.9_arm64/Dockerfile  |  2 ++
 images/10-docker-19.03.9_arm64/prebuild.sh | 21 +++++++++++++++++++++
 index.yml                                  |  1 +
 6 files changed, 67 insertions(+)
 create mode 100644 d/docker-19.03.9.yml
 create mode 100644 images/10-docker-19.03.9/Dockerfile
 create mode 100755 images/10-docker-19.03.9/prebuild.sh
 create mode 100644 images/10-docker-19.03.9_arm64/Dockerfile
 create mode 100755 images/10-docker-19.03.9_arm64/prebuild.sh

diff --git a/d/docker-19.03.9.yml b/d/docker-19.03.9.yml
new file mode 100644
index 00000000..dffe49d3
--- /dev/null
+++ b/d/docker-19.03.9.yml
@@ -0,0 +1,21 @@
+docker:
+  image: ${REGISTRY_DOMAIN}/rancher/os-docker:19.03.9${SUFFIX}
+  command: ros user-docker
+  environment:
+  - HTTP_PROXY
+  - HTTPS_PROXY
+  - NO_PROXY
+  labels:
+    io.rancher.os.scope: system
+    io.rancher.os.after: console
+  net: host
+  pid: host
+  ipc: host
+  uts: host
+  privileged: true
+  restart: always
+  volumes_from:
+  - all-volumes
+  volumes:
+  - /sys:/host/sys
+  - /var/lib/system-docker:/var/lib/system-docker:shared
diff --git a/images/10-docker-19.03.9/Dockerfile b/images/10-docker-19.03.9/Dockerfile
new file mode 100644
index 00000000..4fc137c5
--- /dev/null
+++ b/images/10-docker-19.03.9/Dockerfile
@@ -0,0 +1,2 @@
+FROM scratch
+COPY engine /engine
diff --git a/images/10-docker-19.03.9/prebuild.sh b/images/10-docker-19.03.9/prebuild.sh
new file mode 100755
index 00000000..1df6d9ce
--- /dev/null
+++ b/images/10-docker-19.03.9/prebuild.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -ex
+
+VERSION=$1
+ARCH=$2
+if [ "$ARCH" == "amd64" ]; then
+    DOCKERARCH="x86_64"
+    URL="https://download.docker.com/linux/static/stable/${DOCKERARCH}/docker-${VERSION}.tgz"
+    #ROOTLESS_URL="https://download.docker.com/linux/static/stable/${DOCKERARCH}/docker-rootless-extras-${VERSION}.tgz"
+    COMPLETION_URL="https://raw.githubusercontent.com/docker/cli/v${VERSION}/contrib/completion/bash/docker"
+fi
+
+DEST="./images/10-docker-${VERSION}${SUFFIX}"
+
+mkdir -p $DEST
+curl -sL ${URL} | tar xzf - -C $DEST
+#curl -sL ${ROOTLESS_URL} | tar xzf - -C $DEST
+curl -sL -o $DEST/docker/completion ${COMPLETION_URL}
+mv $DEST/docker $DEST/engine
+#mv $DEST/docker-rootless-extras/* $DEST/engine
diff --git a/images/10-docker-19.03.9_arm64/Dockerfile b/images/10-docker-19.03.9_arm64/Dockerfile
new file mode 100644
index 00000000..4fc137c5
--- /dev/null
+++ b/images/10-docker-19.03.9_arm64/Dockerfile
@@ -0,0 +1,2 @@
+FROM scratch
+COPY engine /engine
diff --git a/images/10-docker-19.03.9_arm64/prebuild.sh b/images/10-docker-19.03.9_arm64/prebuild.sh
new file mode 100755
index 00000000..0d9b9c89
--- /dev/null
+++ b/images/10-docker-19.03.9_arm64/prebuild.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+VERSION=$1
+ARCH=$2
+if [ "$ARCH" == "arm64" ]; then
+    DOCKERARCH="aarch64"
+    URL="https://download.docker.com/linux/static/stable/${DOCKERARCH}/docker-${VERSION}.tgz"
+    #ROOTLESS_URL="https://download.docker.com/linux/static/stable/${DOCKERARCH}/docker-rootless-extras-${VERSION}.tgz"
+    COMPLETION_URL="https://raw.githubusercontent.com/docker/cli/v${VERSION}/contrib/completion/bash/docker"
+    SUFFIX="_${ARCH}"
+fi
+
+DEST="./images/10-docker-${VERSION}${SUFFIX}"
+
+mkdir -p $DEST
+curl -sL ${URL} | tar xzf - -C $DEST
+#curl -sL ${ROOTLESS_URL} | tar xzf - -C $DEST
+curl -sL -o $DEST/docker/completion ${COMPLETION_URL}
+mv $DEST/docker $DEST/engine
+#mv $DEST/docker-rootless-extras/* $DEST/engine
diff --git a/index.yml b/index.yml
index 79332bd2..7911c116 100644
--- a/index.yml
+++ b/index.yml
@@ -60,3 +60,4 @@ engines:
 - docker-19.03.5
 - docker-19.03.7
 - docker-19.03.8
+- docker-19.03.9

From d1df74b44ab3b85b36bed822a357fdaa13d0a3d9 Mon Sep 17 00:00:00 2001
From: Jacob Blain Christen <jacob@rancher.com>
Date: Mon, 1 Jun 2020 12:05:40 -0700
Subject: [PATCH 2/2] images: pin amazon-metadata to alpine 3.11

---
 images/20-amazonmetadata/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/20-amazonmetadata/Dockerfile b/images/20-amazonmetadata/Dockerfile
index 398696f1..6147fb55 100644
--- a/images/20-amazonmetadata/Dockerfile
+++ b/images/20-amazonmetadata/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.11
 # FROM arm64=skip arm=skip
 
 RUN apk -Uuv add bash jq ca-certificates groff less python py-pip && \