Merge pull request #17 from ajstanley/main

Updates for buildkit and starter site
Islandora-Devops · May 1, 2024 · ab89b90 · ab89b90
2 parents 42085f4 + 1b36c8f
commit ab89b90
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/.env b/.env
@@ -30,10 +30,13 @@ CONSISTENCY=delegated
 ISLANDORA_REPOSITORY=islandora
 
 # The version of the isle-buildkit images to use.
-ISLANDORA_TAG=3.1.5
+ISLANDORA_TAG=3.2.3
 
 # The Docker image repository, to push/build for custom images from.
 REPOSITORY=islandora
 
 # The Docker image tag for custom image(s).
 TAG=local
+
+# Default execution times.
+PHP_MAX_EXECUTION_TIME=300
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -124,6 +124,19 @@ services:
             DRUPAL_DEFAULT_SITE_URL: "islandora.io"
             DRUPAL_DEFAULT_SOLR_CORE: "default"
             DRUPAL_DRUSH_URI: "http://islandora.io" # Used by docker/drupal/rootfs/usr/local/share/custom/install.sh
+            NGINX_FASTCGI_CONNECT_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_FASTCGI_READ_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_FASTCGI_SEND_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_KEEPALIVE_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_PROXY_CONNECT_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_PROXY_READ_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_PROXY_SEND_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            NGINX_SEND_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}s
+            PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}
+            PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME}
+            PHP_MAX_INPUT_TIME: ${PHP_MAX_EXECUTION_TIME}
+            PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}
+            PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_MAX_EXECUTION_TIME}
         volumes:
             - type: volume
               source: drupal-public-files
@@ -219,3 +232,4 @@ services:
             - drupal
             - fcrepo
             - solr
+
diff --git a/drupal/Dockerfile b/drupal/Dockerfile
@@ -4,10 +4,10 @@ ARG TAG
 FROM ${REPOSITORY}/drupal:${TAG} AS workbench
 
 ARG TARGETARCH
-ARG WORKBENCH_COMMIT=0824988
+ARG WORKBENCH_COMMIT=c197de3
 ARG WORKBENCH_FILE=${WORKBENCH_COMMIT}.tar.gz
 ARG WORKBENCH_URL=https://github.com/mjordan/islandora_workbench/archive/${WORKBENCH_FILE}
-ARG WORKBENCH_SHA256=486eba0acc44443b1d9e9e2c5e767c4ce416fe442ef016588e68e7804946b033
+ARG WORKBENCH_SHA256=037e6d0616d10977b248043560b07abb697d63f8d8cc3d1317f5ae612d92f7c2
 
 RUN --mount=type=cache,id=sandbox-apk-${TARGETARCH},sharing=locked,target=/var/cache/apk \
     apk add \
@@ -50,10 +50,10 @@ RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=
 FROM ${REPOSITORY}/drupal:${TAG} AS starter
 
 ARG TARGETARCH
-ARG STARTER_SITE_COMMIT=1.6.2
+ARG STARTER_SITE_COMMIT=1.7.1
 ARG STARTER_SITE_FILE=${STARTER_SITE_COMMIT}.tar.gz
 ARG STARTER_SITE_URL=https://github.com/Islandora-Devops/islandora-starter-site/archive/${STARTER_SITE_FILE}
-ARG STARTER_SITE_SHA256=2fa22f44a61dec05a36818ae527f340cf2cdb89dec6dbd975626737c77e8c282
+ARG STARTER_SITE_SHA256=217fab4dc9d15184f6bc11c11f66c316bf08be03d9c0937b64ca90a0057350de
 
 RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
     download.sh \