Fix re-applying existing file permissions

pgautoupgrade · Nov 14, 2024 · 64a177e · 64a177e
1 parent 5bfb07f
commit 64a177e
Show file tree

Hide file tree

Showing 5 changed files with 728 additions and 701 deletions.
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
@@ -185,12 +185,11 @@ RUN apk update && \
 # Pass the PG build target through to the running image
 ENV PGTARGET=${PGTARGET}
 
-# Copy across the post-upgrade shell script
-COPY pgautoupgrade-postupgrade.sh pgautoupgrade-healthcheck.sh /usr/local/bin/
+# Copy across all our shell scripts
+COPY pgautoupgrade-postupgrade.sh pgautoupgrade-healthcheck.sh postgres-docker-entrypoint.sh docker-entrypoint.sh /usr/local/bin/
 
 # Set up the script run by the container when it starts
 WORKDIR /var/lib/postgresql
-COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 HEALTHCHECK CMD /usr/local/bin/pgautoupgrade-healthcheck.sh

diff --git a/Dockerfile.bookworm b/Dockerfile.bookworm
@@ -180,12 +180,11 @@ RUN apt update && \
 # Pass the PG build target through to the running image
 ENV PGTARGET=${PGTARGET}
 
-# Copy across the post-upgrade shell script
-COPY pgautoupgrade-postupgrade.sh pgautoupgrade-healthcheck.sh /usr/local/bin/
+# Copy across all our shell scripts
+COPY pgautoupgrade-postupgrade.sh pgautoupgrade-healthcheck.sh postgres-docker-entrypoint.sh docker-entrypoint.sh /usr/local/bin/
 
 # Set up the script run by the container when it starts
 WORKDIR /var/lib/postgresql
-COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 HEALTHCHECK CMD /usr/local/bin/pgautoupgrade-healthcheck.sh