ubuntu pgyvpn sshd

aogg · Apr 22, 2024 · 3ff6a2e · 3ff6a2e
1 parent edd5679
commit 3ff6a2e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/pgyvpn/tinyproxy-sshd/Dockerfile.ubuntu b/pgyvpn/tinyproxy-sshd/Dockerfile.ubuntu
@@ -0,0 +1,16 @@
+FROM adockero/pgyvpn:ubuntu-tinyproxy
+
+
+RUN apt update \
+    && apt install -y openssh \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && apt-get clean
+
+ENV SSHD_PORT 22
+ENV SSHD_PASSWORD=''
+COPY ./common/open-sshd-passwd.sh /open-sshd-passwd.sh
+
+
+COPY ./pgyvpn/tinyproxy-sshd/docker-entrypoint.sh /docker-entrypoint-sshd.sh
+ENTRYPOINT [ "/docker-entrypoint-sshd.sh" ]
+
diff --git a/pgyvpn/ubuntu/Dockerfile.tinyproxy b/pgyvpn/ubuntu/Dockerfile.tinyproxy
@@ -6,14 +6,14 @@ 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 \
+    && mv /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-tinyproxy.sh
+COPY ./pgyvpn/docker-entrypoint.sh /docker-entrypoint.sh
 
 
 EXPOSE 8888
@@ -22,7 +22,7 @@ EXPOSE 8888
 COPY ./common/one-exec.sh /one-exec.sh
 ENV ONE_EXEC ""
 
-ENTRYPOINT [ "/docker-entrypoint-tinyproxy.sh" ]
+ENTRYPOINT [ "/docker-entrypoint.sh" ]