Updating alpine to the latest

- PHP has been updated to 8.1 - Updated Matomo to 4.12.3 - Removed Customization for JNA - Removed the demo image as it is unmaintained and doesn't support php 8.1
Islandora-Devops · Nov 7, 2022 · b04f7c8 · b04f7c8
1 parent 219677c
commit b04f7c8
Show file tree

Hide file tree

Showing 98 changed files with 37,433 additions and 333 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,6 +14,8 @@
         "composer": "shellscript"
     },
     "cSpell.words": [
+        "autoconfigure",
+        "autowire",
         "binarystorage",
         "CAROOT",
         "catchable",
@@ -22,17 +24,23 @@
         "crond",
         "elif",
         "fastcgi",
+        "FCREPO",
         "filesize",
         "getenv",
+        "homarus",
         "islandora",
+        "JNA",
+        "jsonld",
         "KEEPALIVE",
+        "Matomo",
         "mkcert",
         "MODESHAPE",
         "nativeplatform",
         "nocopy",
         "POSTGRESQL",
         "proxied",
         "SIGTERM",
+        "traefik",
         "xdebug"
     ]
 }
diff --git a/abuild/Dockerfile b/abuild/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2.1
 ARG repository=local
 ARG tag=latest
-ARG alpine=3.15.0
+ARG alpine=3.16.2
 FROM ${repository}/download:${tag} AS download
 FROM alpine:${alpine} AS cache
 FROM alpine:${alpine}

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2.1
 ARG repository=local
 ARG tag=latest
-ARG alpine=3.15.0
+ARG alpine=3.16.2
 FROM ${repository}/download:${tag} AS download
 FROM alpine:${alpine} AS cache
 FROM alpine:${alpine}

diff --git a/cantaloupe/Dockerfile b/cantaloupe/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2.1
 ARG repository=local
 ARG tag=latest
-ARG alpine=3.15.0
+ARG alpine=3.16.2
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
 ARG CANTALOUPE_VERSION="4.1.5"

diff --git a/cantaloupe/README.md b/cantaloupe/README.md
@@ -25,7 +25,7 @@ additional settings, volumes, ports, etc.
 
 ## Settings
 
-| Environment Variable                                                                   | Confd Key                                                                                | Default                                                    |
+| Environment Variable                                                                   | Confd Key                                                                               | Default                                                    |
 | :------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------- | :--------------------------------------------------------- |
 | CANTALOUPE_HTTP_ENABLED                                                                | /cantaloupe/http/enabled                                                                | true                                                       |
 | CANTALOUPE_HTTP_HOST                                                                   | /cantaloupe/http/host                                                                   | 0.0.0.0                                                    |
@@ -166,7 +166,7 @@ additional settings, volumes, ports, etc.
 | CANTALOUPE_REDACTION_ENABLED                                                           | /cantaloupe/redaction/enabled                                                           | false                                                      |
 | CANTALOUPE_METADATA_PRESERVE                                                           | /cantaloupe/metadata/preserve                                                           | false                                                      |
 | CANTALOUPE_METADATA_RESPECT_ORIENTATION                                                | /cantaloupe/metadata/respect/orientation                                                | false                                                      |
-| CANTALOUPE_LOG_APPLICATION_LEVEL                                                       | /cantaloupe/log/application/level                                                       | debug                                                      |
+| CANTALOUPE_LOG_APPLICATION_LEVEL                                                       | /cantaloupe/log/application/level                                                       | info                                                       |
 | CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_ENABLED                                     | /cantaloupe/log/application/consoleappender/enabled                                     | true                                                       |
 | CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_ENABLED                                        | /cantaloupe/log/application/fileappender/enabled                                        | false                                                      |
 | CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_PATHNAME                                       | /cantaloupe/log/application/fileappender/pathname                                       | /opt/tomcat/logs/cantaloupe.application.log                |

diff --git a/code-server/Dockerfile b/code-server/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2.1
 ARG repository=local
 ARG tag=latest
-ARG alpine=3.15.0
+ARG alpine=3.16.2
 FROM alpine:${alpine} AS cache
 FROM node:fermium-alpine3.15 as node
 FROM ${repository}/abuild:${tag} AS build
@@ -89,7 +89,7 @@ RUN sed -i "/nginx:x:100:101:nginx:\/var\/lib\/nginx:\/sbin\/nologin/cnginx:x:10
 RUN --mount=type=cache,id=code-server-drupal-apk,sharing=locked,from=cache,target=/var/cache/apk \
     apk --update add \
         htop \
-        php7-pecl-xdebug \
+        php81-pecl-xdebug \
         spdlog \
         sudo \
         unison \

diff --git a/code-server/rootfs/etc/nginx/shared/drupal.fpm.conf b/code-server/rootfs/etc/nginx/shared/drupal.fpm.conf
@@ -1,5 +1,5 @@
 # Allow for toggling between xdebug / production configured fpm.
-set $fpm php-fpm7;
+set $fpm php-fpm81;
 if ($cookie_XDEBUG_SESSION) {
   set $fpm xdebug;
 }
@@ -23,6 +23,6 @@ location ~ '\.php$|^/update.php' {
     fastcgi_buffers 16 16k;
     fastcgi_buffer_size 32k;
     # PHP 7 socket location.
-    fastcgi_pass unix:/var/run/$fpm/php-fpm7.sock;
+    fastcgi_pass unix:/var/run/$fpm/php-fpm81.sock;
 }
 
diff --git a/code-server/rootfs/etc/services.d/xdebug/run b/code-server/rootfs/etc/services.d/xdebug/run
@@ -3,10 +3,10 @@ set -e
 
 XDEBUG_FLAGS=$(</var/run/s6/container_environment/XDEBUG_FLAGS)
 
-exec /usr/sbin/php-fpm7 \
-    --pid /var/run/xdebug/php-fpm7.pid \
+exec /usr/sbin/php-fpm81 \
+    --pid /var/run/xdebug/php-fpm81.pid \
     --prefix /var/run/xdebug \
-    --fpm-config /etc/php7/php-fpm.conf \
+    --fpm-config /etc/php81/php-fpm.conf \
     -d php_admin_value[zend_extension]=xdebug.so \
     -d zend_extension=xdebug.so \
     ${XDEBUG_FLAGS}
diff --git a/code-server/tests/ServiceStartsWithDefaults/build.gradle.kts b/code-server/tests/ServiceStartsWithDefaults/build.gradle.kts
@@ -0,0 +1,4 @@
+import tasks.tests.ServiceStartsWithDefaultsTest
+tasks.register<ServiceStartsWithDefaultsTest>("test")  {
+    waitForMessage.set("NOTICE: ready to handle connections")
+}
diff --git a/composer/Dockerfile b/composer/Dockerfile
@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1.2.1
 ARG repository=local
 ARG tag=latest
-ARG alpine=3.15.0
+ARG alpine=3.16.2
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download 
 
-ARG COMPOSER_VERSION="2.0.12"
-ARG COMPOSER_SHA256="82ea8c1537cfaceb7e56f6004c7ccdf99ddafce7237c07374d920e635730a631"
+ARG COMPOSER_VERSION="2.3.10"
+ARG COMPOSER_SHA256="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0"
 
 # https://getcomposer.org/download/
 RUN --mount=type=cache,id=download-downloads,sharing=locked,target=/opt/downloads \
@@ -21,31 +21,32 @@ FROM ${repository}/download:${tag}
 # Install packages and tools that allow for basic downloads.
 RUN --mount=type=cache,id=composer-apk,sharing=locked,from=cache,target=/var/cache/apk \
     apk add --no-cache \
-        php7 \
-        php7-ctype \
-        php7-curl \
-        php7-dom \
-        php7-fileinfo \
-        php7-fpm \
-        php7-gd \
-        php7-iconv \
-        php7-json \
-        php7-mbstring \
-        php7-mysqli \
-        php7-opcache \
-        php7-openssl \
-        php7-pdo \
-        php7-pdo_mysql \
-        php7-pdo_pgsql \
-        php7-phar \
-        php7-session \
-        php7-simplexml \
-        php7-tokenizer \
-        php7-xml \
-        php7-xmlwriter \
-        php7-xmlreader \
-        php7-xsl \
+        php81 \
+        php81-ctype \
+        php81-curl \
+        php81-dom \
+        php81-fileinfo \
+        php81-fpm \
+        php81-gd \
+        php81-iconv \
+        php81-json \
+        php81-mbstring \
+        php81-mysqli \
+        php81-opcache \
+        php81-openssl \
+        php81-pdo \
+        php81-pdo_mysql \
+        php81-pdo_pgsql \
+        php81-phar \
+        php81-session \
+        php81-simplexml \
+        php81-tokenizer \
+        php81-xml \
+        php81-xmlwriter \
+        php81-xmlreader \
+        php81-xsl \
     && \
+    ln -s /usr/bin/php81 /usr/bin/php && \
     echo '' > /root/.ash_history
 
 COPY --from=download /usr/bin/composer /usr/bin/composer

diff --git a/crayfish/Dockerfile b/crayfish/Dockerfile
@@ -3,17 +3,21 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
-ARG COMMIT=48cd6acfe4b6892d4ffa20e4fdfe16057a19a142
+# When updating this commit also update the lock files in rootfs/var/www/crayfish.
+ARG COMMIT=22bc67f0906d3a45148d585b28dbc94fc81151ca
 
 RUN --mount=type=cache,id=crayfish-downloads,sharing=locked,target=/opt/downloads \
     git-clone-cached.sh \
-        --url https://github.com/Islandora/Crayfish.git \
+        --url https://github.com/nigelgbanks/Crayfish.git \
         --cache-dir "${DOWNLOAD_CACHE_DIRECTORY}" \
         --commit "${COMMIT}" \
         --worktree /var/www/crayfish
 
-FROM ${repository}/composer:${tag}
+# Use a lock file for reproducible builds, always update it when updating the commit above.
+COPY rootfs/var/www/crayfish /var/www/crayfish
 
-COPY --from=download --chown=nginx:nginx /var/www /var/www
+FROM ${repository}/composer:${tag}
 
 COPY rootfs /
+
+COPY --from=download --chown=nginx:nginx /var/www /var/www
diff --git a/crayfish/rootfs/etc/nginx/http.d/default.conf b/crayfish/rootfs/etc/nginx/http.d/default.conf
@@ -9,7 +9,7 @@ server {
     } 
 
     location ~ ^/index\.php(/|$) {
-        fastcgi_pass unix:/var/run/php-fpm7/php-fpm7.sock;
+        fastcgi_pass unix:/var/run/php-fpm81/php-fpm81.sock;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;