From b32fa1b8d120caaea3711c3f73eba04f46761986 Mon Sep 17 00:00:00 2001
From: AirportR <104753221+AirportR@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:37:33 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix=20=E4=BF=AE=E5=A4=8Dalpine?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile           |  5 +----
 docker/Dockerfile.alpine    |  5 +----
 docker/docker-entrypoint.sh | 11 +----------
 docker/update.sh            |  1 -
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 31b3e00c..c66b93f3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,8 +15,6 @@ ENV startup=1124
 ENV speednodes=300
 ENV speedthread=4
 ENV nospeed=true
-ENV SHELL=/bin/bash
-ENV LANG C.UTF-8
 
 WORKDIR /app
 
@@ -37,7 +35,6 @@ RUN apt-get update && \
     /usr/bin/crontab /etc/cron.d/crontab && \
     chmod +x /app/docker/update.sh && \
     chmod +x /app/docker/docker-entrypoint.sh && \
-    usermod -s /bin/bash root && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=compile-image /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
@@ -45,4 +42,4 @@ COPY --from=compile-image /opt/venv /opt/venv
 
 ENV PATH="/opt/venv/bin:$PATH"
 
-ENTRYPOINT ["bash", "/app/docker/docker-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/app/docker/docker-entrypoint.sh"]
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
index e6c938db..c675206d 100644
--- a/docker/Dockerfile.alpine
+++ b/docker/Dockerfile.alpine
@@ -15,8 +15,6 @@ ENV startup=1124
 ENV speednodes=300
 ENV speedthread=4
 ENV nospeed=true
-ENV SHELL=/bin/bash
-ENV LANG C.UTF-8
 
 WORKDIR /app
 
@@ -33,7 +31,6 @@ RUN apk add --no-cache \
     chmod +x /app/docker/fulltcore.sh && \
     bash /app/docker/fulltcore.sh && \
     chmod +x /app/docker/update.sh && \
-    sed -i 's/ash/bash/g' /etc/passwd && \
     chmod +x /app/docker/docker-entrypoint.sh
 
 COPY --from=compile-image /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
@@ -41,4 +38,4 @@ COPY --from=compile-image /opt/venv /opt/venv
 
 ENV PATH="/opt/venv/bin:$PATH"
 
-ENTRYPOINT ["bash", "/app/docker/docker-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/app/docker/docker-entrypoint.sh"]
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 837e3da1..2efb2f93 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -32,15 +32,6 @@ fi
 
 fi
 
-if [ ! -z "${git_proxy}" ]; then
-mkdir /root/.ssh
-cat > /root/.ssh/config <<EOF
-Host github.com 
-User git
-ProxyCommand connect -S ${git_proxy} %h %p
-EOF
-fi
-
 supervisord -c /etc/supervisord.conf
 
 if [[ -f "/etc/debian_version" ]]; then
@@ -49,4 +40,4 @@ fi
 
 if [[ -f "/etc/alpine-release" ]]; then
     crond -f > /dev/null 2>&1
-fi
+fi
\ No newline at end of file
diff --git a/docker/update.sh b/docker/update.sh
index 4d7db475..9cd9c108 100644
--- a/docker/update.sh
+++ b/docker/update.sh
@@ -26,7 +26,6 @@ update() {
     git --git-dir='/app/.git' --work-tree='/app' reset --hard origin/$git_branch
     git --git-dir='/app/.git' --work-tree='/app' pull
     git_version=$(git --git-dir='/app/.git' --work-tree='/app' rev-parse HEAD)
-    chmod -R 755 /app
 }
 
 if [[ $last_version ==  "$git_version" ]]; then