From c46f64c3b153e36cf00c6e022b07cbfbad2a8d17 Mon Sep 17 00:00:00 2001 From: Nolan Poe Date: Fri, 30 Dec 2022 13:48:17 -0800 Subject: [PATCH] Move files --- p/entrypoint.sh => entrypoint.sh | 7 +++---- p/nginx.conf.example => nginx.conf.example | 0 p/Dockerfile | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) rename p/entrypoint.sh => entrypoint.sh (89%) rename p/nginx.conf.example => nginx.conf.example (100%) diff --git a/p/entrypoint.sh b/entrypoint.sh similarity index 89% rename from p/entrypoint.sh rename to entrypoint.sh index a642a43e..4f599e61 100644 --- a/p/entrypoint.sh +++ b/entrypoint.sh @@ -16,16 +16,15 @@ if [[ -v "HOSTNAME" && -v "EMAIL" ]]; then echo Starting certbot certbot run --nginx -n \ -d $HOSTNAME \ - -d www.$HOSTNAME\ - --agree-tos \ + -d www.$HOSTNAME --agree-tos \ --email $EMAIL \ $TEST echo Starting nginx nginx -s reload - + else echo Please set HOSTNAME and/or EMAIL! exit 1 fi -exec "$@" \ No newline at end of file +exec "$@" diff --git a/p/nginx.conf.example b/nginx.conf.example similarity index 100% rename from p/nginx.conf.example rename to nginx.conf.example diff --git a/p/Dockerfile b/p/Dockerfile index 1e25ae75..048a2491 100644 --- a/p/Dockerfile +++ b/p/Dockerfile @@ -82,16 +82,16 @@ ENV NODE_ENV production # Final image FROM release-base as release # EXPOSE 3000/tcp -ENTRYPOINT [ "node", "server.js" ] +CMD [ "node", "server.js" ] # Final image with extras FROM release-base AS release-aio # Grab nginx and certbot COPY --from=proxy-installer /rpms / -COPY p/entrypoint.sh entrypoint.sh +COPY entrypoint.sh entrypoint.sh RUN chmod +x entrypoint.sh -COPY p/nginx.conf.example /etc/nginx/conf.d/poketube.conf +COPY nginx.conf.example /etc/nginx/conf.d/poketube.conf # EXPOSE 80/tcp # EXPOSE 443/tcp