1638

yanhao98 · Dec 23, 2023 · b0e0d2a · b0e0d2a
1 parent fa845cf
commit b0e0d2a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,6 @@
-FROM fatedier/frps:v0.53.2 as origin-frps
-
 FROM nginx:1
-COPY --from=origin-frps /usr/bin/frps /usr/bin/frps
-
-COPY ./src/nginx/templates /etc/nginx/templates
-COPY ./src/html /usr/share/nginx/html
-
-COPY ./src/dl-frpc.sh /dl-frpc.sh
+COPY --from=fatedier/frps:v0.53.2 /usr/bin/frps /usr/bin/frps
+COPY rootfs/ /
 
 RUN set -xe \
     && mv /docker-entrypoint.sh /docker-entrypoint-nginx.sh \
@@ -15,8 +9,6 @@ RUN set -xe \
     && bash /dl-frpc.sh && rm /dl-frpc.sh \
     && apt-get remove --purge --auto-remove -y unzip zip wget && rm -rf /var/lib/apt/lists/* && apt-get purge -y --auto-remove
 
-COPY ./src/nginx/templates /etc/nginx/templates
-COPY ./src/entry.sh /entry.sh
 # STOPSIGNAL SIGINT
 ENTRYPOINT ["/entry.sh"]
 EXPOSE 80 7000
diff --git a/src/dl-frpc.sh → rootfs/dl-frpc.sh b/src/dl-frpc.sh → rootfs/dl-frpc.sh
diff --git a/src/entry.sh → rootfs/entry.sh b/src/entry.sh → rootfs/entry.sh
diff --git a/src/nginx/templates/default.conf.template → ...templates/templates/default.conf.template b/src/nginx/templates/default.conf.template → ...templates/templates/default.conf.template
diff --git a/src/html/client.sh → rootfs/usr/share/nginx/html/client.sh b/src/html/client.sh → rootfs/usr/share/nginx/html/client.sh
diff --git a/src/html/client.vbs → rootfs/usr/share/nginx/html/client.vbs b/src/html/client.vbs → rootfs/usr/share/nginx/html/client.vbs
diff --git a/src/html/index.html → rootfs/usr/share/nginx/html/index.html b/src/html/index.html → rootfs/usr/share/nginx/html/index.html