tidying up, readability.

cyberworm-uk · Jul 18, 2024 · 80b7b93 · 80b7b93
1 parent f95b151
commit 80b7b93
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/docker-publish-arti.yml b/.github/workflows/docker-publish-arti.yml
@@ -29,11 +29,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push arti
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         env:
           SOURCE_DATE_EPOCH: 0
         with:
           context: arti/
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.actor }}/arti:latest
+          tags: ${{ env.REGISTRY }}/${{ github.actor }}/arti:latest
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -46,6 +46,8 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ github.actor }}/torbase:latest
             ${{ env.DOCKERHUB_USERNAME }}/torbase:latest
+            ${{ env.REGISTRY }}/${{ github.actor }}/tor-base:latest
+            ${{ env.DOCKERHUB_USERNAME }}/tor-base:latest
 
       - name: Build and push proxy
         uses: docker/build-push-action@v6
@@ -133,4 +135,4 @@ jobs:
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ github.actor }}/snowflake-standalone:latest
-            ${{ env.DOCKERHUB_USERNAME }}/snowflake-standalone:latest
+            ${{ env.DOCKERHUB_USERNAME }}/snowflake-standalone:latest
diff --git a/arti/Containerfile b/arti/Containerfile
@@ -13,4 +13,4 @@ COPY --from=build /usr/local/cargo/bin/arti /bin/arti
 COPY arti.toml /arti/arti.toml
 USER arti:arti
 VOLUME [ "/arti" ]
-ENTRYPOINT [ "/bin/arti", "-c", "/arti/arti.toml", "proxy" ]
+ENTRYPOINT [ "/bin/arti", "-c", "/arti/arti.toml", "proxy" ]
diff --git a/lyrebird/Containerfile b/lyrebird/Containerfile
@@ -15,4 +15,4 @@ FROM scratch
 LABEL org.opencontainers.image.base.name="scratch"
 LABEL org.opencontainers.image.title="Lyrebird (binary)"
 LABEL org.opencontainers.image.description="lyrebird client binary only"
-COPY --from=build /lyrebird /lyrebird
+COPY --from=build /lyrebird /lyrebird
diff --git a/obfs4-bridge/Containerfile b/obfs4-bridge/Containerfile
@@ -1,11 +1,16 @@
 FROM ghcr.io/cyberworm-uk/lyrebird:latest AS bin
 
-FROM ghcr.io/cyberworm-uk/torbase:latest
-LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/torbase"
+FROM ghcr.io/cyberworm-uk/tor-base:latest
+LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/tor-base"
 LABEL org.opencontainers.image.title="Obfs4 Bridge"
 LABEL org.opencontainers.image.description="Obfs4 (Lyrebird) Bridge"
 RUN apk --no-cache --no-interactive add libcap-utils
 EXPOSE 443
 COPY --from=bin /lyrebird /usr/bin/lyrebird
 RUN setcap cap_net_bind_service=+ep /usr/bin/lyrebird
-ENTRYPOINT [ "/usr/bin/tor", "--bridgerelay", "1", "--servertransportplugin", "obfs4 exec /usr/bin/lyrebird", "--extorport", "auto", "--servertransportlistenaddr", "obfs4 0.0.0.0:443" ]
+ENTRYPOINT [ "/usr/bin/tor", \
+    "--bridgerelay", "1", \
+    "--servertransportplugin", "obfs4 exec /usr/bin/lyrebird", \
+    "--extorport", "auto", \
+    "--servertransportlistenaddr", "obfs4 0.0.0.0:443" \
+]
diff --git a/obfs4-proxy/Containerfile b/obfs4-proxy/Containerfile
@@ -1,9 +1,13 @@
 FROM ghcr.io/cyberworm-uk/lyrebird:latest AS bin
 
-FROM ghcr.io/cyberworm-uk/torbase:latest
-LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/torbase"
+FROM ghcr.io/cyberworm-uk/tor-base:latest
+LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/tor-base"
 LABEL org.opencontainers.image.title="Obfs4 Proxy"
 LABEL org.opencontainers.image.description="Obfs4 (Lyrebird) Proxy"
 COPY --from=bin /lyrebird /usr/bin/lyrebird
 EXPOSE 9050
-ENTRYPOINT [ "/usr/bin/tor", "--clienttransportplugin", "meek_lite,obfs2,obfs3,obfs4,scramblesuit exec /usr/bin/lyrebird", "--socksport", "0.0.0.0:9050", "--usebridges", "1" ]
+ENTRYPOINT [ "/usr/bin/tor", \
+    "--clienttransportplugin", "meek_lite,obfs2,obfs3,obfs4,scramblesuit exec /usr/bin/lyrebird", \
+    "--socksport", "0.0.0.0:9050", \
+    "--usebridges", "1" \
+]
diff --git a/snowflake-proxy/Containerfile b/snowflake-proxy/Containerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/cyberworm-uk/snowflake:latest AS bin
 
-FROM ghcr.io/cyberworm-uk/torbase:latest
-LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/torbase"
+FROM ghcr.io/cyberworm-uk/tor-base:latest
+LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/tor-base"
 LABEL org.opencontainers.image.title="Snowflake Proxy"
 LABEL org.opencontainers.image.description="Snowflake Proxy"
 COPY --from=bin /client /usr/bin/client
@@ -12,4 +12,4 @@ ENTRYPOINT [ "/usr/bin/tor", \
   "--usebridges", "1", \
   "--bridge", "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", \
   "--bridge", "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" \
-]
+]
diff --git a/snowflake-standalone/Containerfile b/snowflake-standalone/Containerfile
@@ -18,4 +18,4 @@ LABEL org.opencontainers.image.description="Snowflake Standalone (Entry Point)"
 RUN apk --no-cache --no-interactive add ca-certificates tzdata
 COPY --from=build /go/src/proxy/proxy /bin/proxy
 USER 1000
-ENTRYPOINT [ "/bin/proxy" ]
+ENTRYPOINT [ "/bin/proxy" ]
diff --git a/snowflake/Containerfile b/snowflake/Containerfile
@@ -15,4 +15,4 @@ FROM scratch
 LABEL org.opencontainers.image.base.name="scratch"
 LABEL org.opencontainers.image.title="snowflake client (binary)"
 LABEL org.opencontainers.image.description="snowflake client binary only"
-COPY --from=build /go/src/client/client /client
+COPY --from=build /go/src/client/client /client
diff --git a/torbase/Containerfile b/torbase/Containerfile
@@ -6,4 +6,4 @@ RUN apk --no-cache --no-interactive add tor
 COPY torrc /etc/tor/torrc-defaults
 VOLUME [ "/var/lib/tor" ]
 HEALTHCHECK CMD tor-resolve 127.0.0.1
-ENTRYPOINT [ "/usr/bin/tor" ]
+ENTRYPOINT [ "/usr/bin/tor" ]
diff --git a/torproxy/Containerfile b/torproxy/Containerfile
@@ -1,6 +1,6 @@
-FROM ghcr.io/cyberworm-uk/torbase:latest
-LABEL org.opencontainers.image.base.name="docker.io/library/alpine"
+FROM ghcr.io/cyberworm-uk/tor-base:latest
+LABEL org.opencontainers.image.base.name="ghcr.io/cyberworm-uk/tor-base"
 LABEL org.opencontainers.image.title="Tor Proxy"
 LABEL org.opencontainers.image.description="Tor Proxy (client)"
 EXPOSE 9050
-ENTRYPOINT [ "/usr/bin/tor", "--socksport", "0.0.0.0:9050" ]
+ENTRYPOINT [ "/usr/bin/tor", "--socksport", "0.0.0.0:9050" ]