From 8e449d1cea7a67988781a6544e328a64d421356a Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Fri, 22 Aug 2025 15:29:55 +0300 Subject: [PATCH] UHF-11964: Make it easier for a project to add custom files to /hooks folder --- docker/openshift/Dockerfile | 7 +++---- .../{post-db-replace => hooks/db-replace}/10-prepare.sh | 0 .../{post-db-replace => hooks/db-replace}/50-sanitize.sh | 0 .../db-replace}/90-translations.sh | 0 docker/openshift/{ => hooks}/deploy/10-preflight.sh | 0 docker/openshift/{ => hooks}/deploy/20-deploy.sh | 0 6 files changed, 3 insertions(+), 4 deletions(-) rename docker/openshift/{post-db-replace => hooks/db-replace}/10-prepare.sh (100%) rename docker/openshift/{post-db-replace => hooks/db-replace}/50-sanitize.sh (100%) rename docker/openshift/{post-db-replace => hooks/db-replace}/90-translations.sh (100%) rename docker/openshift/{ => hooks}/deploy/10-preflight.sh (100%) rename docker/openshift/{ => hooks}/deploy/20-deploy.sh (100%) diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index fc167791..1943b411 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -7,11 +7,10 @@ RUN composer install --no-progress --profile --prefer-dist --no-interaction --no # Copy custom entrypoints. # @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal -RUN mkdir -p /crons /entrypoints /hooks/deploy /hooks/db-replace +RUN mkdir -p /crons /entrypoints /hooks COPY docker/openshift/entrypoints/ /entrypoints COPY docker/openshift/crons/ /crons -COPY docker/openshift/deploy /hooks/deploy -COPY docker/openshift/post-db-replace /hooks/db-replace -RUN chmod +x /entrypoints/* /hooks/deploy/* /crons/* /hooks/db-replace/* +COPY docker/openshift/hooks/ /hooks +RUN chmod -R +x /entrypoints/* /hooks/* /crons/* COPY docker/openshift/init.sh / diff --git a/docker/openshift/post-db-replace/10-prepare.sh b/docker/openshift/hooks/db-replace/10-prepare.sh similarity index 100% rename from docker/openshift/post-db-replace/10-prepare.sh rename to docker/openshift/hooks/db-replace/10-prepare.sh diff --git a/docker/openshift/post-db-replace/50-sanitize.sh b/docker/openshift/hooks/db-replace/50-sanitize.sh similarity index 100% rename from docker/openshift/post-db-replace/50-sanitize.sh rename to docker/openshift/hooks/db-replace/50-sanitize.sh diff --git a/docker/openshift/post-db-replace/90-translations.sh b/docker/openshift/hooks/db-replace/90-translations.sh similarity index 100% rename from docker/openshift/post-db-replace/90-translations.sh rename to docker/openshift/hooks/db-replace/90-translations.sh diff --git a/docker/openshift/deploy/10-preflight.sh b/docker/openshift/hooks/deploy/10-preflight.sh similarity index 100% rename from docker/openshift/deploy/10-preflight.sh rename to docker/openshift/hooks/deploy/10-preflight.sh diff --git a/docker/openshift/deploy/20-deploy.sh b/docker/openshift/hooks/deploy/20-deploy.sh similarity index 100% rename from docker/openshift/deploy/20-deploy.sh rename to docker/openshift/hooks/deploy/20-deploy.sh