Merge pull request #259 from infosiftr/buildkit

Fixes when building with buildkit
docker-library · Mar 12, 2024 · 5f1aafc · 5f1aafc
2 parents d1c8fc7 + 2c93dfe
commit 5f1aafc
Show file tree

Hide file tree

Showing 25 changed files with 175 additions and 0 deletions.
diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile
diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile
diff --git a/10.1/php8.1/fpm-alpine3.18/Dockerfile b/10.1/php8.1/fpm-alpine3.18/Dockerfile
diff --git a/10.1/php8.1/fpm-alpine3.19/Dockerfile b/10.1/php8.1/fpm-alpine3.19/Dockerfile
diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile
diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile
diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile
diff --git a/10.1/php8.2/fpm-alpine3.18/Dockerfile b/10.1/php8.2/fpm-alpine3.18/Dockerfile
diff --git a/10.1/php8.2/fpm-alpine3.19/Dockerfile b/10.1/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile
diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.18/Dockerfile b/10.2/php8.2/fpm-alpine3.18/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.2/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile
diff --git a/10.2/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.18/Dockerfile b/10.2/php8.3/fpm-alpine3.18/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile
diff --git 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)"; \