use gvisor-tap-vsock v0.6.1

sakai135 · Mar 14, 2023 · b54b3ac · b54b3ac
1 parent 1c39aa8
commit b54b3ac
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 39 deletions.
diff --git a/distro/alpine.dockerfile b/distro/alpine.dockerfile
@@ -1,16 +1,9 @@
-# FROM docker.io/library/alpine:3.17.2 as gvisor-tap-vsock
-# WORKDIR /app/bin
-# RUN wget -O gvproxy-windows.exe https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.0/gvproxy-windows.exe && \
-#     wget -O vm https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.0/vm && \
-#     chmod +x ./gvproxy-windows.exe ./vm
-# RUN find . -type f -exec sha256sum {} \;
-
-FROM docker.io/library/golang:1.20.0-alpine as gvisor-tap-vsock
-WORKDIR /app
-RUN apk add git make
-RUN git clone https://github.com/sakai135/gvisor-tap-vsock.git --single-branch --branch fix-stdio /app
-RUN make && make cross
-RUN find ./bin -type f -exec sha256sum {} \;
+FROM docker.io/library/alpine:3.17.2 as gvisor-tap-vsock
+WORKDIR /app/bin
+RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/gvproxy-windows.exe && \
+    wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/vm && \
+    chmod +x ./gvproxy-windows.exe ./vm
+RUN find . -type f -exec sha256sum {} \;
 
 FROM docker.io/library/alpine:3.17.2
 RUN apk update && \

diff --git a/distro/fedora.dockerfile b/distro/fedora.dockerfile
@@ -1,16 +1,9 @@
-# FROM docker.io/library/golang:1.20.0-alpine as gvisor-tap-vsock
-# WORKDIR /app
-# RUN apk add git make
-# RUN git clone https://github.com/containers/gvisor-tap-vsock.git --single-branch /app
-# RUN make && make cross
-# RUN find ./bin -type f -exec sha256sum {} \;
-
-FROM docker.io/library/golang:1.20.0-alpine as gvisor-tap-vsock
-WORKDIR /app
-RUN apk add git make
-RUN git clone https://github.com/sakai135/gvisor-tap-vsock.git --single-branch --branch fix-stdio /app
-RUN make && make cross
-RUN find ./bin -type f -exec sha256sum {} \;
+FROM docker.io/library/alpine:3.17.2 as gvisor-tap-vsock
+WORKDIR /app/bin
+RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/gvproxy-windows.exe && \
+    wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/vm && \
+    chmod +x ./gvproxy-windows.exe ./vm
+RUN find . -type f -exec sha256sum {} \;
 
 FROM docker.io/library/fedora:37
 RUN dnf upgrade -y && \

diff --git a/distro/ubuntu.dockerfile b/distro/ubuntu.dockerfile
@@ -1,16 +1,9 @@
-# FROM docker.io/library/golang:1.20.0-alpine as gvisor-tap-vsock
-# WORKDIR /app
-# RUN apk add git make
-# RUN git clone https://github.com/containers/gvisor-tap-vsock.git --single-branch /app
-# RUN make && make cross
-# RUN find ./bin -type f -exec sha256sum {} \;
-
-FROM docker.io/library/golang:1.20.0-alpine as gvisor-tap-vsock
-WORKDIR /app
-RUN apk add git make
-RUN git clone https://github.com/sakai135/gvisor-tap-vsock.git --single-branch --branch fix-stdio /app
-RUN make && make cross
-RUN find ./bin -type f -exec sha256sum {} \;
+FROM docker.io/library/alpine:3.17.2 as gvisor-tap-vsock
+WORKDIR /app/bin
+RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/gvproxy-windows.exe && \
+    wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.6.1/vm && \
+    chmod +x ./gvproxy-windows.exe ./vm
+RUN find . -type f -exec sha256sum {} \;
 
 FROM docker.io/library/ubuntu:22.04
 RUN apt-get update && \