Skip to content

Commit

Permalink
no need leave meta
Browse files Browse the repository at this point in the history
  • Loading branch information
Mon-ius committed Feb 22, 2024
1 parent e4eb5bd commit b3e6436
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 33 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push v1 meta
uses: docker/build-push-action@v5
with:
context: .
file: ./dev/v1/Meta
push: true
platforms: linux/amd64, linux/arm64, linux/s390x, linux/arm
tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-warp-socks:meta_v1
-
name: Build and push v1 file
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -79,15 +70,6 @@ jobs:
push: true
platforms: linux/amd64, linux/arm64, linux/s390x, linux/arm
tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-warp-socks:meta
-
name: Build and push meta_v2
uses: docker/build-push-action@v5
with:
context: .
file: ./dev/Meta
push: true
platforms: linux/amd64, linux/arm64, linux/s390x, linux/arm
tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-warp-socks:meta_v2
-
name: Build and push v2
uses: docker/build-push-action@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/verify_chain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v4
- run: |
curl -fsSL bit.ly/warp_socks | sh -s -- "$name" "linux/amd64" "v2" "$port"
date && sleep 10 && docker ps -a && date && docker logs "$name"
date && sleep 15 && docker ps -a && date && docker logs "$name"
- id: check
run: echo trace=$(curl -v -x "$SOCKS:$port" -fsSL $TRACE | grep -w "warp=on") >> $GITHUB_OUTPUT
- run: echo "The proxy status is ${{ steps.check.outputs.trace }}"
Expand All @@ -62,7 +62,7 @@ jobs:
uses: actions/checkout@v4
- run: |
curl -fsSL bit.ly/warp_socks | sh -s -- "$name" "linux/amd64" "v2" "$port" "monius" "passwd"
date && sleep 10 && docker ps -a && date && docker logs "$name"
date && sleep 15 && docker ps -a && date && docker logs "$name"
- id: check
run: echo trace=$(curl -v -U $AUTH -x "$SOCKS:$port" -fsSL $TRACE | grep -w "warp=on") >> $GITHUB_OUTPUT
- run: echo "The proxy status is ${{ steps.check.outputs.trace }}"
Expand All @@ -88,7 +88,7 @@ jobs:
SAMPLE_LICENSE=$(grep -o '"license":"[^"]*' /tmp/warp.dat | awk -F'"' '{print $4}')
curl -fsSL bit.ly/warp_socks | sh -s -- "$name" "linux/amd64" "v2" "$port" "monius" "passwd" "$SAMPLE_LICENSE"
date && sleep 10 && docker ps -a && date && docker logs "$name"
date && sleep 15 && docker ps -a && date && docker logs "$name"
- id: check
run: echo trace=$(curl -v -U $AUTH -x "$SOCKS:$port" -fsSL $TRACE | grep -w "warp=plus") >> $GITHUB_OUTPUT
- run: echo "The proxy status is ${{ steps.check.outputs.trace }}"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM monius/docker-warp-socks:meta_v2
FROM monius/docker-warp-socks:meta
ENV LOG=0

COPY entrypoint.sh /run/entrypoint.sh
Expand Down
11 changes: 9 additions & 2 deletions dev/v1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
FROM monius/docker-warp-socks:meta_v1
ENV LOG=0
FROM debian:bookworm
ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ="Europe/London"

RUN apt-get -qq update \
&& apt-get -qq install curl net-tools \
&& apt-get -qq install --no-install-recommends dante-server iproute2 procps iptables openresolv kmod wireguard \
&& apt-get -qq autoremove --purge && apt-get clean && rm -rf /var/lib/apt/lists/*

COPY entrypoint.sh /run/entrypoint.sh
ENTRYPOINT ["/run/entrypoint.sh"]
Expand Down
9 changes: 0 additions & 9 deletions dev/v1/Meta

This file was deleted.

0 comments on commit b3e6436

Please sign in to comment.