OpenConext · baszoetekouw · Jul 2, 2025 · Jul 2, 2025 · Jul 2, 2025 · Jul 2, 2025
diff --git a/.github/workflows/build-php72-apache2-node14-composer2.yaml b/.github/workflows/build-php72-apache2-node14-composer2.yaml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-push-php72:
+  build-push-php72-node14:
     runs-on: ubuntu-latest
     permissions:
       packages: write

diff --git a/.github/workflows/build-php72-apache2-node16-composer2.yaml b/.github/workflows/build-php72-apache2-node16-composer2.yaml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-push-php72:
+  build-push-php72-node16:
     runs-on: ubuntu-latest
     permissions:
       packages: write

diff --git a/.github/workflows/build-php82-apache2-node20-composer2.yaml b/.github/workflows/build-php82-apache2-node20-composer2.yaml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-push-php82:
+  build-push-php82-node20:
     runs-on: ubuntu-latest
     permissions:
       packages: write

diff --git a/apache2-shibboleth/Dockerfile b/apache2-shibboleth/Dockerfile
@@ -1,34 +1,29 @@
 FROM ghcr.io/openconext/openconext-basecontainers/apache2:latest
 
-# Set things up for Apt
+# Install the Shibboleth daemon and Apache2 modules
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt clean && apt autoclean && apt update
+RUN \
+    apt update && \
+    apt install -y \
+        shibboleth-sp-common \
+        shibboleth-sp-utils \
+        libapache2-mod-shib \
+        gettext \
+    && \
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
 
-# Install the Shibboleth daemon and Apache2 modules
-RUN apt install -y shibboleth-sp-common \
-  shibboleth-sp-utils \
-  libapache2-mod-shib \
-  gettext
-
-# Clean up
-RUN apt autoremove -y && \
-  apt clean && \
-  apt autoclean && \
-  rm -rf /var/lib/apt/lists/* && \
-  a2enmod shib && \
-  mkdir -p /run/shibboleth
+
+# Enable Shib
+RUN mkdir -p /run/shibboleth
+RUN a2enmod shib
 
 # Copy config files
 COPY ./conf/shibboleth/* /etc/shibboleth/
 
 # Copy the startup script
-COPY ./bin/entrypoint.sh /entrypoint.sh
-COPY ./bin/shib.sh /usr/local/bin/shib.sh
-RUN chmod +x /entrypoint.sh ; chmod +x /usr/local/bin/shib.sh
+COPY --chmod=755 ./bin/entrypoint.sh /entrypoint.sh
+COPY --chmod=755 ./bin/shib.sh /usr/local/bin/shib.sh
 
-# Copy the entrypoint script
-COPY ./bin/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
 # Set the default workdir
 WORKDIR /var/www/html
 
@@ -38,4 +33,3 @@ EXPOSE 80
 # Start Shibboleth and Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/usr/local/bin/shib.sh"]
-
diff --git a/apache2/Dockerfile b/apache2/Dockerfile
@@ -7,9 +7,9 @@ RUN apt update && \
     apt -y install \
         apache2 \
         curl \
-        xz-utils && \
-    rm -rf /var/cache/apt && \
-    rm -rf /var/lib/apt/lists/*
+        xz-utils  \
+    && \
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
 
 # Copy the default apache config
 COPY ./conf/security.conf ./conf/openconext.conf /etc/apache2/conf-available/

diff --git a/php72-apache2-node14-composer2/Dockerfile b/php72-apache2-node14-composer2/Dockerfile
@@ -1,26 +1,27 @@
 FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest
 
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
-
-RUN \
-    apt update && \
-    apt -y install git unzip zip vim && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt
-
+COPY --from=composer:2   /usr/bin/composer /usr/bin/composer
 COPY --from=node:14-slim /usr/local/bin /usr/local/bin
 COPY --from=node:14-slim /opt /opt
 COPY --from=node:14-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
-RUN npm install -g yarn --force
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN \
-    pecl install xdebug-3.1.6 && \
-    docker-php-ext-enable xdebug
+  apt-get update && \
+  apt-get -y install \
+    git \
+    unzip \
+    vim \
+    zip  \
+  && \
+  rm -rf /var/lib/apt/lists/* /var/cache/apt
+RUN npm install -g yarn --force
+
+# enable xdebug
+RUN docker-php-ext-enable xdebug
 COPY ./conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-RUN \
-    rm -rf /etc/apache2/sites-enabled/* && \
-    mkdir -p /var/www/html/public
+RUN mkdir /var/www/html/public
 
+RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
-
-SHELL ["/bin/bash", "--login", "-c"]
diff --git a/php72-apache2-node16-composer2/Dockerfile b/php72-apache2-node16-composer2/Dockerfile
@@ -2,10 +2,10 @@ FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest
 
 COPY --from=composer:2   /usr/bin/composer /usr/bin/composer
 COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+COPY --from=node:16-slim /opt /opt
 COPY --from=node:16-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
 
-SHELL ["/bin/bash", "--login", "-c"]
-
+ENV DEBIAN_FRONTEND=noninteractive
 RUN \
   apt-get update && \
   apt-get -y install \
@@ -15,17 +15,13 @@ RUN \
     zip  \
   && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
-
-
 RUN npm install -g yarn --force
 
-RUN \
-  pecl install xdebug-3.1.6 && \
-  docker-php-ext-enable xdebug
+# enable xdebug
+RUN docker-php-ext-enable xdebug
 COPY ./conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-RUN \
-  rm -rf /etc/apache2/sites-enabled/* && \
-  mkdir /var/www/html/public
+RUN mkdir /var/www/html/public
 
+RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
diff --git a/php72-apache2/Dockerfile b/php72-apache2/Dockerfile
@@ -3,23 +3,23 @@ FROM docker.io/library/php:7.2-apache-buster
 ENV PHP_MEMORY_LIMIT=128M
 ENV TZ=Europe/Amsterdam
 ENV DEBIAN_FRONTEND=noninteractive
+
 # Copy the Composer PHAR from the Composer image into the PHP image
-COPY --from=composer:1.9.3 /usr/bin/composer /usr/bin/composer
-RUN chmod +x /usr/bin/composer
+COPY --from=composer:1.9.3 --chmod=755 /usr/bin/composer /usr/bin/composer
 
 # Install the packages we need
 RUN \
   apt-get update && \
   apt-get install -y \
     curl \
-    libxml2 \
-    libxml2-dev \
-    libicu-dev \
     libfreetype6-dev \
+    libgmp3-dev \
+    libicu-dev \
     libjpeg62-turbo-dev \
     libpng-dev \
-    libgmp3-dev \
-  && \
+    libxml2 \
+    libxml2-dev \
+     && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
 
 # Install the PHP 7.2 extensions we need
@@ -39,18 +39,21 @@ RUN pecl install -f apcu_bc
 COPY ./conf/apcu.ini /usr/local/etc/php/conf.d/91-apcu.ini
 COPY ./conf/apc.ini  /usr/local/etc/php/conf.d/92-acp.ini
 
+# install xdebug but do not enable by default
+RUN pecl install xdebug-3.1.6
+
 # Clean up
 # don't autoremove, becasue that will remove libraries needed for the custom-built php extensions
 RUN \
   apt-get -y purge \
-    libxml2-dev \
-    libicu-dev \
+    icu-devtools \
     libfreetype6-dev \
-    libjpeg62-turbo-dev \
-    libpng-dev \
     libgmp-dev \
     libgmp3-dev \
-    icu-devtools \
+    libicu-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    libxml2-dev \
     zlib1g-dev \
   && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
@@ -66,8 +69,7 @@ COPY ./conf/openconext.conf  ./conf/security.conf  /etc/apache2/conf-enabled/
 COPY ./conf/php.ini ./conf/php-cli.ini /usr/local/etc/php/
 
 # Copy the startup script
-COPY ./bin/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+COPY --chmod=755 ./bin/entrypoint.sh /entrypoint.sh
 
 # Set the default workdir
 WORKDIR /var/www/html

diff --git a/php82-apache2-node20-composer2/Dockerfile b/php82-apache2-node20-composer2/Dockerfile
@@ -1,27 +1,27 @@
 FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest
 
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2   /usr/bin/composer /usr/bin/composer
 COPY --from=node:20-slim /usr/local/bin /usr/local/bin
 COPY --from=node:20-slim /opt /opt
 COPY --from=node:20-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN \
-  apt update && \
-  apt -y install \
+  apt-get update && \
+  apt-get -y install \
     git \
     unzip \
-    zip \
     vim \
+    zip  \
   && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
+RUN npm install -g yarn --force
 
-RUN \
-  pecl install xdebug && \
-  docker-php-ext-enable xdebug
+# enable xdebug
+RUN docker-php-ext-enable xdebug
 COPY ./conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-RUN \
-    rm -rf /etc/apache2/sites-enabled/* && \
-    mkdir -p /var/www/html/public
+RUN mkdir -p /var/www/html/public
 
+RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
diff --git a/php82-apache2/Dockerfile b/php82-apache2/Dockerfile
@@ -4,22 +4,24 @@ ENV PHP_MEMORY_LIMIT=128M
 ENV TZ=Europe/Amsterdam
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Copy the Composer PHAR from the Composer image into the PHP image
+COPY --from=composer:1.9.3 --chmod=755 /usr/bin/composer /usr/bin/composer
+
 # Install the packages we need
 RUN \
   apt-get update && \
   apt-get install -y \
     curl \
-    libxml2 \
-    libxml2-dev \
-    libicu-dev \
     libfreetype6-dev \
+    libgmp3-dev \
+    libicu-dev \
     libjpeg62-turbo-dev \
     libpng-dev \
-    libgmp3-dev \
+    libxml2 \
+    libxml2-dev \
   && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
 
-
 # Install the PHP 8.2 extensions we need
 RUN docker-php-ext-install -j$(nproc) pdo_mysql
 RUN docker-php-ext-install -j$(nproc) opcache
@@ -29,19 +31,21 @@ RUN docker-php-ext-install -j$(nproc) xml
 RUN docker-php-ext-install -j$(nproc) intl
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg && docker-php-ext-install -j$(nproc) gd
 
+# install xdebug but do not enable by default
+RUN pecl install xdebug
 
 # Clean up
 # don't autoremove, becasue that will remove libraries needed for the custom-built php extensions
 RUN \
   apt-get -y purge \
-    libxml2-dev \
-    libicu-dev \
+    icu-devtools \
     libfreetype6-dev \
-    libjpeg62-turbo-dev \
-    libpng-dev \
     libgmp-dev \
     libgmp3-dev \
-    icu-devtools \
+    libicu-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    libxml2-dev \
     zlib1g-dev \
   && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt
@@ -57,8 +61,7 @@ COPY ./conf/openconext.conf  ./conf/security.conf  /etc/apache2/conf-enabled/
 COPY ./conf/php.ini ./conf/php-cli.ini /usr/local/etc/php/
 
 # Copy the startup script
-COPY ./bin/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+COPY --chmod=755 ./bin/entrypoint.sh /entrypoint.sh
 
 # Set the default workdir
 WORKDIR /var/www/html

diff --git a/python3/Dockerfile b/python3/Dockerfile
@@ -1,5 +1,8 @@
 FROM docker.io/library/python:3.11-slim-bookworm
 
+ENV PYTHON_VERSION_MAJOR=3
+ENV PYTHON_VERSION_MINOR=3.11
+
 # Do an initial clean up and general upgrade of the distribution
 ENV DEBIAN_FRONTEND=noninteractive
 RUN \
@@ -9,7 +12,6 @@ RUN \
         build-essential                                  \
         bzip2                                            \
         curl                                             \
-        clang                                            \
         default-libmysqlclient-dev                       \
         git                                              \
         libxmlsec1-dev                                   \
@@ -19,7 +21,7 @@ RUN \
         xz-utils                                         \
         && \
     apt-get -y autoremove                             && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
 
 # if specified, drop privileges to this uid and gid
 ARG RUNAS_UID