Skip to content

Commit

Permalink
Upgrade Docker to 24.0, add WSL support, and remove Google DNS (#186)
Browse files Browse the repository at this point in the history
  • Loading branch information
silver886 authored May 18, 2023
1 parent 4fea41d commit 9ed6415
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ RUN for mirror in $TCL_MIRRORS; do \
echo '# https://1.1.1.1/'; \
echo 'nameserver 1.1.1.1'; \
echo 'nameserver 1.0.0.1'; \
echo; \
echo '# https://developers.google.com/speed/public-dns/'; \
echo 'nameserver 8.8.8.8'; \
echo 'nameserver 8.8.4.4'; \
} > etc/resolv.conf; \
cp etc/resolv.conf etc/resolv.conf.b2d; \
{ \
Expand Down Expand Up @@ -187,7 +183,7 @@ ENV LINUX_GPG_KEYS \
AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109

# updated via "update.sh"
ENV LINUX_VERSION 6.1.28
ENV LINUX_VERSION 6.1.29

RUN wget -O /linux.tar.xz "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.xz"; \
wget -O /linux.tar.asc "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.sign"; \
Expand Down Expand Up @@ -384,7 +380,7 @@ RUN tcl-tce-load open-vm-tools; \

# https://www.parallels.com/products/desktop/download/
# updated via "update.sh"
ENV PARALLELS_VERSION 18.2.0-53488
ENV PARALLELS_VERSION 18.3.0-53606

RUN wget -O /parallels.tgz "https://download.parallels.com/desktop/v${PARALLELS_VERSION%%.*}/$PARALLELS_VERSION/ParallelsTools-$PARALLELS_VERSION-boot2docker.tar.gz"; \
mkdir /usr/src/parallels; \
Expand Down Expand Up @@ -420,6 +416,9 @@ RUN make -C /usr/src/linux/tools/hv hv_kvp_daemon; \
cp /usr/src/linux/tools/hv/hv_kvp_daemon usr/local/sbin/; \
tcl-chroot hv_kvp_daemon --help || [ "$?" = 1 ]

# Windows Subsystem for Linux config for Windows 11 and Server 2022 and later
COPY files/wsl.conf etc/wsl.conf

# TCL includes QEMU's guest agent 2.0.2+ (no reason to compile that ourselves)
RUN qemuTemp="$(mktemp -d)"; \
pushd "$qemuTemp"; \
Expand Down Expand Up @@ -454,7 +453,7 @@ RUN wget -O usr/local/sbin/cgroupfs-mount "https://github.com/tianon/cgroupfs-mo

# https://download.docker.com/linux/static/stable/x86_64/
# updated via "update.sh"
ENV DOCKER_VERSION 23.0.6
ENV DOCKER_VERSION 24.0.0

# Get the Docker binaries with version that matches our boot2docker version.
RUN DOCKER_CHANNEL='stable'; \
Expand Down
4 changes: 4 additions & 0 deletions files/wsl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[boot]
command = mkdir -p /var/lib/boot2docker && echo 'DOCKER_REMOTE=yes' > /var/lib/boot2docker/profile && NOZSWAP=true /etc/init.d/rcS
[user]
default = docker
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mirrors=(
# https://www.kernel.org/
kernelBase='6.1'
# https://download.docker.com/linux/static/stable/x86_64/
dockerBase='23.0'
dockerBase='24.0'

# avoid issues with slow Git HTTP interactions (*cough* sourceforge *cough*)
export GIT_HTTP_LOW_SPEED_LIMIT='100'
Expand Down

0 comments on commit 9ed6415

Please sign in to comment.