From 399fb0659dda5fd8cfdc608af6476e004a4d4b87 Mon Sep 17 00:00:00 2001
From: Shahrad Elahi <shahradq@gmail.com>
Date: Thu, 15 Feb 2024 11:46:16 +0330
Subject: [PATCH] chore

---
 Dockerfile                             | 20 +++++++++++---------
 Dockerfile-Dev                         | 22 ++++++++++++----------
 web/src/routes/[serverId]/+page.svelte |  1 -
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 77ac3ab..45018f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,15 @@
-FROM node:alpine as base
+ARG ALPINE_VERSION=3.19
+
+FROM --platform=$BUILDPLATFORM chriswayg/tor-alpine:latest as tor
+FROM --platform=$BUILDPLATFORM node:alpine${ALPINE_VERSION} as base
 LABEL Maintainer="Shahrad Elahi <https://github.com/shahradelahi>"
 WORKDIR /app
 
 ENV TZ=UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY --from=chriswayg/tor-alpine:latest --platform=$BUILDPLATFORM /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
-COPY --from=chriswayg/tor-alpine:latest --platform=$BUILDPLATFORM /usr/local/bin/meek-server /usr/local/bin/meek-server
+COPY --from=tor /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
+COPY --from=tor /usr/local/bin/meek-server /usr/local/bin/meek-server
 
 # Update and upgrade packages
 RUN apk update && apk upgrade &&\
@@ -30,7 +33,6 @@ RUN chmod -R +x /usr/local/bin
 COPY web/package.json web/pnpm-lock.yaml ./
 
 # Base env
-ENV ORIGIN=http://127.0.0.1:3000
 ENV PROTOCOL_HEADER=x-forwarded-proto
 ENV HOST_HEADER=x-forwarded-host
 
@@ -62,6 +64,11 @@ FROM base AS release
 COPY --from=build /tmp/node_modules node_modules
 COPY --from=build /tmp/build build
 
+# Fix permissions
+RUN mkdir -p /data && chmod 700 /data
+RUN mkdir -p /etc/torrc.d && chmod -R 400 /etc/torrc.d
+RUN mkdir -p /var/vlogs && touch /var/vlogs/web && chmod -R 600 /var/vlogs
+
 ENV NODE_ENV=production
 ENV LOG_LEVEL=error
 
@@ -74,11 +81,6 @@ ENTRYPOINT ["/entrypoint.sh"]
 HEALTHCHECK --interval=60s --timeout=3s --start-period=20s --retries=3 \
  CMD curl -f http://127.0.0.1:3000/api/health || exit 1
 
-# Fix permissions
-RUN mkdir -p /data && chmod 700 /data
-RUN mkdir -p /etc/torrc.d && chmod -R 400 /etc/torrc.d
-RUN mkdir -p /var/vlogs && touch /var/vlogs/web && chmod -R 600 /var/vlogs
-
 # Volumes
 VOLUME ["/etc/torrc.d", "/data", "/var/vlogs"]
 
diff --git a/Dockerfile-Dev b/Dockerfile-Dev
index 3bab47d..70e2f88 100644
--- a/Dockerfile-Dev
+++ b/Dockerfile-Dev
@@ -1,12 +1,15 @@
-FROM node:alpine as base
+ARG ALPINE_VERSION=3.19
+
+FROM --platform=$BUILDPLATFORM chriswayg/tor-alpine:latest as tor
+FROM --platform=$BUILDPLATFORM node:alpine${ALPINE_VERSION} as base
 LABEL Maintainer="Shahrad Elahi <https://github.com/shahradelahi>"
 WORKDIR /app
 
 ENV TZ=UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
-COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/meek-server /usr/local/bin/meek-server
+COPY --from=tor /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
+COPY --from=tor /usr/local/bin/meek-server /usr/local/bin/meek-server
 
 # Update and upgrade packages
 RUN apk update && apk upgrade &&\
@@ -35,27 +38,26 @@ ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
 
 # Base env
-ENV ORIGIN=http://127.0.0.1:5173,http://localhost:5173
 ENV PROTOCOL_HEADER=x-forwarded-proto
 ENV HOST_HEADER=x-forwarded-host
 
 
 FROM base AS runner
 
+ENV VERSION=0.0.0-dev
 ENV NODE_ENV=development
 ENV LOG_LEVEL=debug
 
-ENV VERSION=0.0.0-dev
-
-COPY docker-entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-
 # Fix permissions
 RUN mkdir -p /data && chmod 700 /data
 RUN mkdir -p /etc/torrc.d && chmod -R 400 /etc/torrc.d
 RUN mkdir -p /var/vlogs && touch /var/vlogs/web && chmod -R 600 /var/vlogs
 
+# Setup entrypoint
+COPY docker-entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
 # Volumes
 VOLUME ["/etc/torrc.d", "/data", "/var/vlogs"]
 
diff --git a/web/src/routes/[serverId]/+page.svelte b/web/src/routes/[serverId]/+page.svelte
index d0ae5c2..5e82c1f 100644
--- a/web/src/routes/[serverId]/+page.svelte
+++ b/web/src/routes/[serverId]/+page.svelte
@@ -96,7 +96,6 @@
   <span class="mb-0.5"> {data.server.name} </span>
 </div>
 
-
 <div class="space-y-3.5">
   <Card>
     <CardHeader>