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

Commit

Permalink
fix dockerfile linter warning
Browse files Browse the repository at this point in the history
  • Loading branch information
mriedmann committed Feb 21, 2023
1 parent 9c3d9a3 commit 2cdf50a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:22.04
LABEL maintainer="Cloudflight GmbH"

ARG WSL_VPNKIT_VERSION=0.3.8

Expand All @@ -7,7 +8,6 @@ RUN apt-get update \
socat \
iputils-ping \
dnsutils \
wget \
curl \
ca-certificates \
gnupg \
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# download VPNKit binaries
RUN wget https://github.com/sakai135/wsl-vpnkit/releases/download/v${WSL_VPNKIT_VERSION}/wsl-vpnkit.tar.gz \
RUN curl -L "https://github.com/sakai135/wsl-vpnkit/releases/download/v${WSL_VPNKIT_VERSION}/wsl-vpnkit.tar.gz" --output wsl-vpnkit.tar.gz \
&& tar --strip-components=1 -xf wsl-vpnkit.tar.gz app/wsl-vpnkit files/wsl-gvproxy.exe files/wsl-vm \
&& rm wsl-vpnkit.tar.gz \
&& mv wsl-vm /usr/local/sbin/ \
Expand All @@ -47,8 +47,8 @@ RUN wget https://github.com/sakai135/wsl-vpnkit/releases/download/v${WSL_VPNKIT_

COPY root/ /

RUN mkdir -p $HOME/.docker/cli-plugins/ \
&& ln -s /usr/local/bin/docker-compose $HOME/.docker/cli-plugins/docker-compose \
RUN mkdir -p "$HOME/.docker/cli-plugins/" \
&& ln -s /usr/local/bin/docker-compose "$HOME/.docker/cli-plugins/docker-compose" \
&& chmod +x /usr/local/bin/* \
&& chown root:root /usr/local/bin/* \
&& update-alternatives --set iptables /usr/sbin/iptables-legacy \
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.data
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM alpine:3.17
LABEL maintainer="Cloudflight GmbH"

COPY /root/etc/wsl.conf /etc/
Expand All @@ -9,5 +9,5 @@ RUN mkdir -p /var/lib/docker \

USER docker

CMD /bin/ash
CMD [ "/bin/ash" ]
VOLUME /var/lib/docker

0 comments on commit 2cdf50a

Please sign in to comment.