diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7ecbc57 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.dapper +.dapper.tmp +dist/images diff --git a/Dockerfile.dapper b/Dockerfile.dapper index df43716..fe06efc 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -31,7 +31,7 @@ ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKE ENV DOCKER_URL DOCKER_URL_${ARCH} # Export all ARGS as ENV -ENV ARCH=${ARCH} +ENV ARCH=${ARCH} ENV DISTRIB_ID=${DISTRIB_ID} ENV DOCKER_PATCH_VERSION=${DOCKER_PATCH_VERSION} ENV DOCKER_URL=${DOCKER_URL} @@ -71,6 +71,8 @@ RUN curl -sfL https://github.com/rancher/docker/releases/download/v1.11.2-ros1/d mv /assets/docker /assets/docker-1.11.2_arm64 RUN curl -sfL https://get.docker.com/builds/Linux/x86_64/docker-1.12.1.tgz | tar xzf - -C /assets && \ mv /assets/docker /assets/docker-1.12.1 +RUN curl -sfL https://get.docker.com/builds/Linux/x86_64/docker-1.12.3.tgz | tar xzf - -C /assets && \ + mv /assets/docker /assets/docker-1.12.3 ENTRYPOINT ["./scripts/entry"] CMD ["ci"] diff --git a/images/10-docker-1.12.3/Dockerfile b/images/10-docker-1.12.3/Dockerfile new file mode 100644 index 0000000..4fc137c --- /dev/null +++ b/images/10-docker-1.12.3/Dockerfile @@ -0,0 +1,2 @@ +FROM scratch +COPY engine /engine diff --git a/images/10-docker-1.12.3/prebuild.sh b/images/10-docker-1.12.3/prebuild.sh new file mode 100755 index 0000000..21e21ed --- /dev/null +++ b/images/10-docker-1.12.3/prebuild.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -e + +cp -r /assets/docker-1.12.3 ./images/10-docker-1.12.3/engine