From 2c93dfe6e25f4923180d2f75ad45b8c51b9159cd Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 12 Mar 2024 15:43:07 -0700 Subject: [PATCH] Fixes when building with buildkit since it doesn't have `/.dockerenv` (https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218) --- 10.1/php8.1/apache-bookworm/Dockerfile | 7 +++++++ 10.1/php8.1/apache-bullseye/Dockerfile | 7 +++++++ 10.1/php8.1/fpm-alpine3.18/Dockerfile | 7 +++++++ 10.1/php8.1/fpm-alpine3.19/Dockerfile | 7 +++++++ 10.1/php8.1/fpm-bookworm/Dockerfile | 7 +++++++ 10.1/php8.1/fpm-bullseye/Dockerfile | 7 +++++++ 10.1/php8.2/apache-bookworm/Dockerfile | 7 +++++++ 10.1/php8.2/apache-bullseye/Dockerfile | 7 +++++++ 10.1/php8.2/fpm-alpine3.18/Dockerfile | 7 +++++++ 10.1/php8.2/fpm-alpine3.19/Dockerfile | 7 +++++++ 10.1/php8.2/fpm-bookworm/Dockerfile | 7 +++++++ 10.1/php8.2/fpm-bullseye/Dockerfile | 7 +++++++ 10.2/php8.2/apache-bookworm/Dockerfile | 7 +++++++ 10.2/php8.2/apache-bullseye/Dockerfile | 7 +++++++ 10.2/php8.2/fpm-alpine3.18/Dockerfile | 7 +++++++ 10.2/php8.2/fpm-alpine3.19/Dockerfile | 7 +++++++ 10.2/php8.2/fpm-bookworm/Dockerfile | 7 +++++++ 10.2/php8.2/fpm-bullseye/Dockerfile | 7 +++++++ 10.2/php8.3/apache-bookworm/Dockerfile | 7 +++++++ 10.2/php8.3/apache-bullseye/Dockerfile | 7 +++++++ 10.2/php8.3/fpm-alpine3.18/Dockerfile | 7 +++++++ 10.2/php8.3/fpm-alpine3.19/Dockerfile | 7 +++++++ 10.2/php8.3/fpm-bookworm/Dockerfile | 7 +++++++ 10.2/php8.3/fpm-bullseye/Dockerfile | 7 +++++++ Dockerfile.template | 7 +++++++ 25 files changed, 175 insertions(+) diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile index 857640d6..4b1cfd29 100644 --- a/10.1/php8.1/apache-bookworm/Dockerfile +++ b/10.1/php8.1/apache-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile index 8d1d4ecb..373374fa 100644 --- a/10.1/php8.1/apache-bullseye/Dockerfile +++ b/10.1/php8.1/apache-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.1/fpm-alpine3.18/Dockerfile b/10.1/php8.1/fpm-alpine3.18/Dockerfile index e527a702..638bb025 100644 --- a/10.1/php8.1/fpm-alpine3.18/Dockerfile +++ b/10.1/php8.1/fpm-alpine3.18/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.1/fpm-alpine3.19/Dockerfile b/10.1/php8.1/fpm-alpine3.19/Dockerfile index 79fcdb31..80454fd0 100644 --- a/10.1/php8.1/fpm-alpine3.19/Dockerfile +++ b/10.1/php8.1/fpm-alpine3.19/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile index ab49a8de..5b8f976a 100644 --- a/10.1/php8.1/fpm-bookworm/Dockerfile +++ b/10.1/php8.1/fpm-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile index f9578ee9..195891c2 100644 --- a/10.1/php8.1/fpm-bullseye/Dockerfile +++ b/10.1/php8.1/fpm-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile index e43c2b1c..4f108b58 100644 --- a/10.1/php8.2/apache-bookworm/Dockerfile +++ b/10.1/php8.2/apache-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile index aae048a5..b93e28a0 100644 --- a/10.1/php8.2/apache-bullseye/Dockerfile +++ b/10.1/php8.2/apache-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/fpm-alpine3.18/Dockerfile b/10.1/php8.2/fpm-alpine3.18/Dockerfile index 9205a860..ef98ab86 100644 --- a/10.1/php8.2/fpm-alpine3.18/Dockerfile +++ b/10.1/php8.2/fpm-alpine3.18/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/fpm-alpine3.19/Dockerfile b/10.1/php8.2/fpm-alpine3.19/Dockerfile index 5c28ddbd..18409b9a 100644 --- a/10.1/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.1/php8.2/fpm-alpine3.19/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile index 2d8d544a..84eebadc 100644 --- a/10.1/php8.2/fpm-bookworm/Dockerfile +++ b/10.1/php8.2/fpm-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile index 46e3b4e0..647fc572 100644 --- a/10.1/php8.2/fpm-bullseye/Dockerfile +++ b/10.1/php8.2/fpm-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 ENV DRUPAL_VERSION 10.1.8 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile index fcfc6a28..bc5a2134 100644 --- a/10.2/php8.2/apache-bookworm/Dockerfile +++ b/10.2/php8.2/apache-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile index 379c4458..4fbb9cdb 100644 --- a/10.2/php8.2/apache-bullseye/Dockerfile +++ b/10.2/php8.2/apache-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/fpm-alpine3.18/Dockerfile b/10.2/php8.2/fpm-alpine3.18/Dockerfile index e486e7e1..653e4d81 100644 --- a/10.2/php8.2/fpm-alpine3.18/Dockerfile +++ b/10.2/php8.2/fpm-alpine3.18/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile index 86f6f848..9e3080b9 100644 --- a/10.2/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.2/fpm-alpine3.19/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile index 80565e60..9dc49c4a 100644 --- a/10.2/php8.2/fpm-bookworm/Dockerfile +++ b/10.2/php8.2/fpm-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile index ca77fc08..9b2ad1a3 100644 --- a/10.2/php8.2/fpm-bullseye/Dockerfile +++ b/10.2/php8.2/fpm-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile index 4c5d92e7..4b87765f 100644 --- a/10.2/php8.3/apache-bookworm/Dockerfile +++ b/10.2/php8.3/apache-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile index 08ffe4db..9ee5f310 100644 --- a/10.2/php8.3/apache-bullseye/Dockerfile +++ b/10.2/php8.3/apache-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/fpm-alpine3.18/Dockerfile b/10.2/php8.3/fpm-alpine3.18/Dockerfile index ea2d7e71..1b8ea734 100644 --- a/10.2/php8.3/fpm-alpine3.18/Dockerfile +++ b/10.2/php8.3/fpm-alpine3.18/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile index ded0d33f..eb885cdd 100644 --- a/10.2/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.3/fpm-alpine3.19/Dockerfile @@ -58,6 +58,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile index afc56b9d..2e99d092 100644 --- a/10.2/php8.3/fpm-bookworm/Dockerfile +++ b/10.2/php8.3/fpm-bookworm/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/10.2/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile index d71c09f3..627ab8c6 100644 --- a/10.2/php8.3/fpm-bullseye/Dockerfile +++ b/10.2/php8.3/fpm-bullseye/Dockerfile @@ -69,6 +69,13 @@ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # 2024-03-06: https://www.drupal.org/project/drupal/releases/10.2.4 ENV DRUPAL_VERSION 10.2.4 +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ diff --git a/Dockerfile.template b/Dockerfile.template index e88b631e..b5d1c6d5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -93,6 +93,13 @@ COPY --from=composer:{{ .composer.version }} /usr/bin/composer /usr/local/bin/ ENV DRUPAL_VERSION {{ .version }} {{ if has("composer") then ( -}} +# https://github.com/docker-library/drupal/pull/259 +# https://github.com/moby/buildkit/issues/4503 +# https://github.com/composer/composer/issues/11839 +# https://github.com/composer/composer/issues/11854 +# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 +ENV COMPOSER_ALLOW_SUPERUSER 1 + WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \