Skip to content
This repository was archived by the owner on Aug 3, 2021. It is now read-only.

Commit 09acadb

Browse files
authored
Merge pull request #3 from bassrock/docker-update
Update to Docker 20.10.0
2 parents 09aa32c + f2040ba commit 09acadb

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ENV LINUX_GPG_KEYS \
179179
647F28654894E3BD457199BE38DBBDC86092693E
180180

181181
# updated via "update.sh"
182-
ENV LINUX_VERSION 5.9.12
182+
ENV LINUX_VERSION 5.9.14
183183

184184
RUN wget -O /linux.tar.xz "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.xz"; \
185185
wget -O /linux.tar.asc "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.sign"; \
@@ -397,7 +397,7 @@ RUN cp -vr /usr/src/parallels/tools/* ./; \
397397

398398
# https://github.com/xenserver/xe-guest-utilities/tags
399399
# updated via "update.sh"
400-
ENV XEN_VERSION 7.20.0
400+
ENV XEN_VERSION 7.21.0
401401

402402
RUN wget -O /xen.tgz "https://github.com/xenserver/xe-guest-utilities/archive/v$XEN_VERSION.tar.gz"; \
403403
mkdir /usr/src/xen; \
@@ -428,7 +428,7 @@ RUN wget -O usr/local/sbin/cgroupfs-mount "https://github.com/tianon/cgroupfs-mo
428428
chmod +x usr/local/sbin/cgroupfs-mount; \
429429
tcl-chroot cgroupfs-mount
430430

431-
ENV DOCKER_VERSION 19.03.14
431+
ENV DOCKER_VERSION 20.10.0
432432

433433
# Get the Docker binaries with version that matches our boot2docker version.
434434
RUN DOCKER_CHANNEL='stable'; \
@@ -442,7 +442,7 @@ RUN DOCKER_CHANNEL='stable'; \
442442
rm /docker.tgz; \
443443
\
444444
# download bash-completion too
445-
wget -O usr/local/share/bash-completion/completions/docker "https://github.com/docker/docker-ce/raw/v${DOCKER_VERSION}/components/cli/contrib/completion/bash/docker"; \
445+
wget -O usr/local/share/bash-completion/completions/docker "https://github.com/docker/cli/tree/v$DOCKER_VERSION/contrib/completion/bash/docker"; \
446446
\
447447
for binary in \
448448
containerd \

0 commit comments

Comments
 (0)