From dfda3fe94b7a4d3d2e285edd33780a8673cd540e Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sat, 14 Sep 2024 01:23:17 -0400 Subject: [PATCH 1/4] Fix: Build older version of ZeroTier Anything from 1.12.0+ just doesn't work on Zoraxy --- docker/Dockerfile | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5a72f8a..5533f56 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:alpine AS build +FROM docker.io/golang:alpine AS build-zoraxy RUN mkdir -p /opt/zoraxy/source/ &&\ mkdir -p /usr/local/bin/ @@ -12,17 +12,31 @@ RUN go mod tidy &&\ go build -o /usr/local/bin/zoraxy &&\ chmod 755 /usr/local/bin/zoraxy -FROM docker.io/alpine:latest +FROM docker.io/ubuntu:latest AS build-zerotier -WORKDIR /opt/zoraxy/source/ +RUN mkdir -p /opt/zerotier/source/ &&\ + mkdir -p /usr/local/bin/ -RUN apk add --no-cache bash netcat-openbsd sudo &&\ - wget https://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/zerotier-one-1.10.2-r0.apk &&\ - apk add --no-cache zerotier-one-1.10.2-r0.apk &&\ - rm -r /opt/zoraxy/source/ +WORKDIR /opt/zerotier/source/ + +RUN apt-get update -y &&\ + apt-get install -y curl jq build-essential pkg-config clang cargo libssl-dev + +RUN curl -Lo ZeroTierOne.tar.gz https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/refs/tags/1.10.6 &&\ + tar -xzvf ZeroTierOne.tar.gz &&\ + cd ZeroTierOne-* &&\ + make &&\ + mv ./zerotier-one /usr/local/bin/zerotier-one &&\ + chmod 755 /usr/local/bin/zerotier-one + +FROM docker.io/ubuntu:latest + +RUN apt-get update -y &&\ + apt-get install -y bash sudo netcat-openbsd libssl-dev -COPY --from=build /usr/local/bin/zoraxy /usr/local/bin/zoraxy COPY --chmod=700 ./entrypoint.sh /opt/zoraxy/ +COPY --from=build-zoraxy /usr/local/bin/zoraxy /usr/local/bin/zoraxy +COPY --from=build-zerotier /usr/local/bin/zerotier-one /usr/local/bin/zerotier-one WORKDIR /opt/zoraxy/config/ From a944c3ff3636c913abf1108972c1e06dd35cd13d Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Mon, 16 Sep 2024 13:09:37 -0400 Subject: [PATCH 2/4] Fix #307 --- docker/Dockerfile | 2 +- docker/entrypoint.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5533f56..baf3fa4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,7 @@ RUN curl -Lo ZeroTierOne.tar.gz https://codeload.github.com/zerotier/ZeroTierOne FROM docker.io/ubuntu:latest RUN apt-get update -y &&\ - apt-get install -y bash sudo netcat-openbsd libssl-dev + apt-get install -y bash sudo netcat-openbsd libssl-dev ca-certificates COPY --chmod=700 ./entrypoint.sh /opt/zoraxy/ COPY --from=build-zoraxy /usr/local/bin/zoraxy /usr/local/bin/zoraxy diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 72f3de9..69836d6 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,8 +1,11 @@ #!/usr/bin/env bash +update-ca-certificates +echo "CA certificates updated" + if [ "$ZEROTIER" = "true" ]; then - echo "Starting ZeroTier daemon..." zerotier-one -d + echo "ZeroTier daemon started" fi echo "Starting Zoraxy..." From 90cf26306a60a1912cb8d4af227b9c21a49db657 Mon Sep 17 00:00:00 2001 From: Toby Chui Date: Sun, 20 Oct 2024 17:25:28 +0800 Subject: [PATCH 3/4] Update CNAME --- docs/CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CNAME b/docs/CNAME index af53805..fb4ed15 100644 --- a/docs/CNAME +++ b/docs/CNAME @@ -1 +1 @@ -zoraxy.arozos.com \ No newline at end of file +zoraxy.aroz.org \ No newline at end of file From cf14d12c31bbe1986b33bd2158101b465848c544 Mon Sep 17 00:00:00 2001 From: Toby Chui Date: Sun, 20 Oct 2024 17:36:51 +0800 Subject: [PATCH 4/4] Update index.html Updated all links to aroz.org --- docs/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/index.html b/docs/index.html index bb451d2..2a57cd8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,19 +12,19 @@ - + - + - - + + - +