From b15abd54d82009adea48a531cd9a1555ac82080a Mon Sep 17 00:00:00 2001
From: mol <hiiragi10073@163.com>
Date: Thu, 25 Jan 2024 17:56:54 +0800
Subject: [PATCH] feat: test

---
 Dockerfile            | 44 ++++++++++++++++++++++++++-----------------
 docker-entry-point.sh | 16 ++++++++++++++++
 2 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100755 docker-entry-point.sh

diff --git a/Dockerfile b/Dockerfile
index 85a607b..acf18cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,36 @@
 FROM node
 EXPOSE 8080
+EXPOSE 22
 WORKDIR /app
 
+COPY . .
+
 VOLUME [ "/data" ]
-EXPOSE 22
 
-RUN apt-get update && apt-get install -y vim 
-RUN apt-get install -y git 
-RUN apt-get install -y openssh-server
-RUN npm i -g n && npm i -g live-server
-RUN git config --global user.name $GIT_USER && git config --global user.email $GIT_EMAIL
+ARG PROXY
+ENV https_proxy=${PROXY}
+ENV http_proxy=${PROXY}
 
-RUN echo "root:${PASSWD}" | chpasswd 
-RUN rm -f /etc/ssh/ssh_host_rsa_key && \
-    ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && \
-    rm -f /etc/ssh/ssh_host_dsa_key && \
-    ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' && \
-    rm -f /etc/ssh/ssh_host_ecdsa_key && \
-    ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && \
-    rm -f /etc/ssh/ssh_host_ed25519_key && \
-    ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' 
-RUN sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/"  /etc/ssh/sshd_config
+RUN export http_proxy=$http_proxy \
+					  && export https_proxy=$https_proxy \
+					  && apt-get update  \
+					  && apt-get install -y vim \
+					  && apt-get install -y git \
+					  && apt-get install -y openssh-server \
+					  && npm i -g n \
+					  && npm i -g live-server \
+					  && touch info.log
 
-CMD ["/usr/sbin/sshd", "-D"]
+					  RUN rm -f /etc/ssh/ssh_host_rsa_key && \
+						  ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && \
+						  rm -f /etc/ssh/ssh_host_dsa_key && \
+						  ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' && \
+						  rm -f /etc/ssh/ssh_host_ecdsa_key && \
+						  ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && \
+						  rm -f /etc/ssh/ssh_host_ed25519_key && \
+						  ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' 
+
+						  RUN sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/"  /etc/ssh/sshd_config
+
+ENTRYPOINT ["/app/docker-entry-point.sh"]
 
diff --git a/docker-entry-point.sh b/docker-entry-point.sh
new file mode 100755
index 0000000..2945798
--- /dev/null
+++ b/docker-entry-point.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ -n "$ROOT_PASSWD" ]; then
+	echo "root:${ROOT_PASSWD}" | chpasswd
+	echo "密码设置完毕" >> /app/info.log
+fi
+
+if [ -n "$GIT_USER" ] && [ -n "$GIT_EMAIL" ]; then
+	git config --global user.name "$GIT_USER"
+	git config --global user.email "$GIT_EMAIL"
+	echo "git 用户已设置完毕" >> /app/info.log
+fi
+
+service ssh start
+
+tail -f /app/info.log