diff --git a/.gitignore b/.gitignore index 6300ca9..ed9e30a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # ---> Linux *~ +.idea/ # temporary files which can be created if a process still has a handle open of a deleted file .fuse_hidden* @@ -46,7 +47,8 @@ $RECYCLE.BIN/ .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* diff --git a/1.21/Dockerfile b/1.21/Dockerfile index 9f558db..c33a2b6 100644 --- a/1.21/Dockerfile +++ b/1.21/Dockerfile @@ -136,10 +136,10 @@ RUN sed -i 's,listen 80;,listen 8080;,' /etc/nginx/conf.d/default.co && chown -R $UID:0 /etc/nginx \ && chmod -R g+w /etc/nginx -COPY docker-entrypoint.sh / -COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d -COPY 20-envsubst-on-templates.sh /docker-entrypoint.d -COPY 30-tune-worker-processes.sh /docker-entrypoint.d +COPY 1.21/docker-entrypoint.sh / +COPY 1.21/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d +COPY 1.21/20-envsubst-on-templates.sh /docker-entrypoint.d +COPY 1.21/30-tune-worker-processes.sh /docker-entrypoint.d ENTRYPOINT ["/docker-entrypoint.sh"] EXPOSE 8080