Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update drupal #8542

Merged
merged 1 commit into from
Aug 12, 2020
Merged

Update drupal #8542

merged 1 commit into from
Aug 12, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 12, 2020

Changes:

Changes:

- docker-library/drupal@3bdf3d6: Merge pull request docker-library/drupal#178 from davidbarratt/composer-bin-path
- docker-library/drupal@4e4d23e: Update Dockerfiles
- docker-library/drupal@a792d2a: Add the composer bin folder to the PATH
@github-actions
Copy link

Diff for 0b2ef76:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7bbbc75..0409ffd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -18,45 +18,45 @@ Directory: 7/fpm-buster
 
 Tags: 8.8.8-apache-buster, 8.8-apache-buster, 8.8.8-apache, 8.8-apache, 8.8.8, 8.8
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 530833e89ecc367b136b720d1ca89b6d5379ae57
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.8/apache-buster
 
 Tags: 8.8.8-fpm-alpine3.12, 8.8-fpm-alpine3.12, 8.8.8-fpm-alpine, 8.8-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 530833e89ecc367b136b720d1ca89b6d5379ae57
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.8/fpm-alpine3.12
 
 Tags: 8.8.8-fpm-buster, 8.8-fpm-buster, 8.8.8-fpm, 8.8-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 530833e89ecc367b136b720d1ca89b6d5379ae57
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.8/fpm-buster
 
 Tags: 8.9.3-apache-buster, 8.9-apache-buster, 8-apache-buster, 8.9.3-apache, 8.9-apache, 8-apache, 8.9.3, 8.9, 8
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 201b7c008434fc0cd187270c89804abdcbfff293
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.9/apache-buster
 
 Tags: 8.9.3-fpm-alpine3.12, 8.9-fpm-alpine3.12, 8-fpm-alpine3.12, 8.9.3-fpm-alpine, 8.9-fpm-alpine, 8-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 201b7c008434fc0cd187270c89804abdcbfff293
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.9/fpm-alpine3.12
 
 Tags: 8.9.3-fpm-buster, 8.9-fpm-buster, 8-fpm-buster, 8.9.3-fpm, 8.9-fpm, 8-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 201b7c008434fc0cd187270c89804abdcbfff293
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 8.9/fpm-buster
 
 Tags: 9.0.3-apache-buster, 9.0-apache-buster, 9-apache-buster, apache-buster, 9.0.3-apache, 9.0-apache, 9-apache, apache, 9.0.3, 9.0, 9, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: be98c136f919d081e21e5b327e3e6338bb99f410
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 9.0/apache-buster
 
 Tags: 9.0.3-fpm-alpine3.12, 9.0-fpm-alpine3.12, 9-fpm-alpine3.12, fpm-alpine3.12, 9.0.3-fpm-alpine, 9.0-fpm-alpine, 9-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: be98c136f919d081e21e5b327e3e6338bb99f410
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 9.0/fpm-alpine3.12
 
 Tags: 9.0.3-fpm-buster, 9.0-fpm-buster, 9-fpm-buster, fpm-buster, 9.0.3-fpm, 9.0-fpm, 9-fpm, fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: be98c136f919d081e21e5b327e3e6338bb99f410
+GitCommit: 4e4d23ee86e88a0e6e88ec28837402ad1c8453fa
 Directory: 9.0/fpm-buster
diff --git a/drupal_8-fpm-alpine/Dockerfile b/drupal_8-fpm-alpine/Dockerfile
index f6989cc..8ccf6d4 100644
--- a/drupal_8-fpm-alpine/Dockerfile
+++ b/drupal_8-fpm-alpine/Dockerfile
@@ -62,4 +62,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_8-fpm/Dockerfile b/drupal_8-fpm/Dockerfile
index ba4a8b0..018e369 100644
--- a/drupal_8-fpm/Dockerfile
+++ b/drupal_8-fpm/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_8.8-fpm-alpine/Dockerfile b/drupal_8.8-fpm-alpine/Dockerfile
index ccb0c54..4f8c28b 100644
--- a/drupal_8.8-fpm-alpine/Dockerfile
+++ b/drupal_8.8-fpm-alpine/Dockerfile
@@ -62,4 +62,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_8.8-fpm/Dockerfile b/drupal_8.8-fpm/Dockerfile
index bd567c0..95f3ab0 100644
--- a/drupal_8.8-fpm/Dockerfile
+++ b/drupal_8.8-fpm/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_8.8/Dockerfile b/drupal_8.8/Dockerfile
index 035909e..1cfc4e2 100644
--- a/drupal_8.8/Dockerfile
+++ b/drupal_8.8/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_8/Dockerfile b/drupal_8/Dockerfile
index 3ee1710..0e465a2 100644
--- a/drupal_8/Dockerfile
+++ b/drupal_8/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile
index cb301f9..e927062 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_fpm-alpine/Dockerfile
@@ -62,4 +62,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index e3e2cda..8bf916e 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index f4c7a33..f70b293 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -72,4 +72,6 @@ RUN set -eux; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
+ENV PATH=${PATH}:/opt/drupal/vendor/bin
+
 # vim:set ft=dockerfile:

@yosifkit yosifkit merged commit 853f178 into docker-library:master Aug 12, 2020
@yosifkit yosifkit deleted the drupal branch August 12, 2020 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants