diff --git a/Dockerfile b/Dockerfile index 2017360..0934f89 100644 --- 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 b/rootfs/dl-frpc.sh similarity index 100% rename from src/dl-frpc.sh rename to rootfs/dl-frpc.sh diff --git a/src/entry.sh b/rootfs/entry.sh similarity index 100% rename from src/entry.sh rename to rootfs/entry.sh diff --git a/src/nginx/templates/default.conf.template b/rootfs/etc/nginx/templates/templates/default.conf.template similarity index 100% rename from src/nginx/templates/default.conf.template rename to rootfs/etc/nginx/templates/templates/default.conf.template diff --git a/src/html/client.sh b/rootfs/usr/share/nginx/html/client.sh similarity index 100% rename from src/html/client.sh rename to rootfs/usr/share/nginx/html/client.sh diff --git a/src/html/client.vbs b/rootfs/usr/share/nginx/html/client.vbs similarity index 100% rename from src/html/client.vbs rename to rootfs/usr/share/nginx/html/client.vbs diff --git a/src/html/index.html b/rootfs/usr/share/nginx/html/index.html similarity index 100% rename from src/html/index.html rename to rootfs/usr/share/nginx/html/index.html