Skip to content
This repository has been archived by the owner on May 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #227 from x-jokay/docker190311
Browse files Browse the repository at this point in the history
Add Docker 19.03.11
  • Loading branch information
dweomer authored Jun 1, 2020
2 parents 4011a76 + 3e19c44 commit f0e2da8
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 0 deletions.
21 changes: 21 additions & 0 deletions d/docker-19.03.11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
docker:
image: ${REGISTRY_DOMAIN}/rancher/os-docker:19.03.11${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
2 changes: 2 additions & 0 deletions images/10-docker-19.03.11/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM scratch
COPY engine /engine
20 changes: 20 additions & 0 deletions images/10-docker-19.03.11/prebuild.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions images/10-docker-19.03.11_arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM scratch
COPY engine /engine
21 changes: 21 additions & 0 deletions images/10-docker-19.03.11_arm64/prebuild.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ engines:
- docker-19.03.7
- docker-19.03.8
- docker-19.03.9
- docker-19.03.11

0 comments on commit f0e2da8

Please sign in to comment.