fix: resolve minor inconsistencies in COPY and chmod

This change does two things:
* Makes COPY commands consistent across Dockerfile files
* Uses `find` to execute chmod in case a directory is empty

Signed-off-by: Elijah Zupancic <[email protected]>

Author: dekobon

Dockerfile.buildkit.plus

@@ -90,4 +90,5 @@ COPY common/docker-entrypoint.d /docker-entrypoint.d/
 RUN set -x \
     && mkdir -p /var/cache/nginx/s3_proxy \
     && chown nginx:nginx /var/cache/nginx/s3_proxy \
-    && chmod -R -v +x /docker-entrypoint.sh /docker-entrypoint.d/*.sh;
+    && chmod -v +x /docker-entrypoint.sh \
+    && find /docker-entrypoint.d -type f -name '*.sh' -exec chmod -v +x {} \;

Dockerfile.oss

@@ -35,12 +35,13 @@ RUN set -x \
       nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
     && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list
 
-COPY oss/etc /etc
+COPY oss/etc/nginx /etc/nginx
 COPY common/etc /etc
 COPY common/docker-entrypoint.sh /docker-entrypoint.sh
 COPY common/docker-entrypoint.d /docker-entrypoint.d/
 
 RUN set -x \
     && mkdir -p /var/cache/nginx/s3_proxy \
     && chown nginx:nginx /var/cache/nginx/s3_proxy \
-    && chmod -R -v +x /docker-entrypoint.sh /docker-entrypoint.d/*.sh;
+    && chmod -v +x /docker-entrypoint.sh /docker-entrypoint.d/*.sh \
+    && find /docker-entrypoint.d -type f -name '*.sh' -exec chmod -v +x {} \;

Dockerfile.plus

@@ -83,8 +83,10 @@ RUN set -x \
 COPY plus/etc/nginx /etc/nginx
 COPY common/etc /etc
 COPY common/docker-entrypoint.sh /docker-entrypoint.sh
+COPY common/docker-entrypoint.d /docker-entrypoint.d/
 
 RUN set -x \
     && mkdir -p /var/cache/nginx/s3_proxy \
     && chown nginx:nginx /var/cache/nginx/s3_proxy \
-    && chmod -R -v +x /docker-entrypoint.sh /docker-entrypoint.d/*.sh;
+    && chmod -R -v +x /docker-entrypoint.sh /docker-entrypoint.d/*.sh \
+    && find /docker-entrypoint.d -type f -name '*.sh' -exec chmod -v +x {} \;