1356

yanhao98 · Feb 20, 2024 · 909b3c8 · 909b3c8
1 parent 7d27ab2
commit 909b3c8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 56 deletions.
diff --git a/.gitea/workflows/00-sync2gh.yml b/.gitea/workflows/00-sync2gh.yml
diff --git a/.gitea/workflows/docker-image.yml b/.gitea/workflows/docker-image.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM nginx:1-bookworm
+FROM nginx:1.25.4-bookworm
+FROM fatedier/frps:v0.54.0 as frps
 ARG DEBIAN_FRONTEND='noninteractive'
 
 ARG S6_OVERLAY_VERSION=3.1.6.2
@@ -9,7 +10,8 @@ RUN set -x && \
     curl --fail ${S6_OVERLAY_BASE_URL}/v${S6_OVERLAY_VERSION}/s6-overlay-`uname -m| sed 's/armv7l/armhf/g'`.tar.xz -SLo- | tar -C / -Jxpf - && \
     apt-get purge -y --auto-remove xz-utils
 
-COPY --from=fatedier/frps:v0.54.0 /usr/bin/frps /usr/bin/frps
+# COPY --from=fatedier/frps:v0.54.0 /usr/bin/frps /usr/bin/frps
+COPY --from=frps /usr/bin/frps /usr/bin/frps
 COPY rootfs/ /
 COPY rootfs-s6-rc/ /
 
@@ -23,4 +25,4 @@ RUN set -x && \
 
 STOPSIGNAL SIGTERM
 ENTRYPOINT ["/init"]
-EXPOSE 80 7000
+EXPOSE 80 7000