pgyvpn

aogg · Apr 22, 2024 · edd5679 · edd5679
1 parent 76f1fa0
commit edd5679
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pgyvpn/ubuntu/Dockerfile b/pgyvpn/ubuntu/Dockerfile
@@ -2,7 +2,7 @@
 FROM ubuntu:20.04
 
 RUN apt update \
-    && apt install -y wget \
+    && apt install -y wget net-tools inetutils-ping \
     && echo '开始pgyvpn' \
     && wget https://pgy.oray.com/softwares/153/download/2156/PgyVisitor_6.2.0_x86_64.deb \
     && dpkg -i PgyVisitor_6.2.0_x86_64.deb \

diff --git a/pgyvpn/ubuntu/Dockerfile.tinyproxy b/pgyvpn/ubuntu/Dockerfile.tinyproxy
@@ -5,13 +5,15 @@ FROM adockero/pgyvpn:ubuntu
 RUN apt update \
     && apt install -y tinyproxy \
     && ln -s $(which tinyproxy) /usr/sbin/ \
+    && mkdir -p /usr/share/pgyvpn/script/ \
+    && ln -s /docker-entrypoint.sh /usr/share/pgyvpn/script/pgystart \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && apt-get clean
 
 COPY --from=monokal/tinyproxy /opt/docker-tinyproxy/run.sh /docker-tinyproxy-run.sh
 
 # COPY --chmod 0755 docker-entrypoint.sh /docker-entrypoint.sh
-COPY ./pgyvpn/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./pgyvpn/docker-entrypoint.sh /docker-entrypoint-tinyproxy.sh
 
 
 EXPOSE 8888
@@ -20,7 +22,7 @@ EXPOSE 8888
 COPY ./common/one-exec.sh /one-exec.sh
 ENV ONE_EXEC ""
 
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
+ENTRYPOINT [ "/docker-entrypoint-tinyproxy.sh" ]