diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 884572de..2fdbb098 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -148,42 +148,16 @@ jobs: - name: Test run: go test -v -failfast ./... -timeout=60m -# windows: -# runs-on: windows-latest -# steps: -# - uses: actions/checkout@v2 -# -# - name: Set up Go -# uses: actions/setup-go@v2 -# with: -# go-version: 1.19 -# # - run: | -# # choco install docker-desktop -# # docker version -# # docker run --rm hello-world -# - run: | -# choco install virtualbox -# choco install minikube -# minikube start --driver=virtualbox -# minikube kubectl -- get po -A -# choco install make -# - name: Kubernetes info -# run: | -# kubectl cluster-info dump -# kubectl get pods -n kube-system -o wide -# - name: Install demo bookinfo -# run: kubectl apply -f https://raw.githubusercontent.com/KubeNetworks/kubevpn/master/samples/bookinfo.yaml -# -# - name: Build -# run: make kubevpn-windows -# -# - name: Wait for pods reviews to be ready -# run: | -# kubectl wait pods -l app=reviews --for=condition=Ready --timeout=600s -# kubectl get all -o wide -# kubectl get nodes -o yaml -# ipconfig -# -# - name: Test -# run: go test -v ./... -timeout=60m + windows: + runs-on: windows-latest + needs: [ "image" ] + steps: + - uses: actions/checkout@v2 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.19 + + - name: Build + run: make kubevpn-windows-amd64 \ No newline at end of file diff --git a/build/Dockerfile b/build/Dockerfile index 3a6f8483..1475505a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -16,7 +16,7 @@ ARG BASE=github.com/wencaiwulue/kubevpn RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list \ && sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl \ - net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute conntrack + net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute conntrack socat ENV TZ=Asia/Shanghai \ DEBIAN_FRONTEND=noninteractive diff --git a/build/local.Dockerfile b/build/local.Dockerfile index 5a400561..6433a209 100644 --- a/build/local.Dockerfile +++ b/build/local.Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:latest RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list \ && sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl \ - net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute conntrack + net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute conntrack socat ENV TZ=Asia/Shanghai \ DEBIAN_FRONTEND=noninteractive