Add initial jq-based templating engine #190
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Minor tweaks in https://github.com/docker-library/drupal/compare/9b1524f7179f024575a6c6a444775e055198dd8a..3c39be3c070c8296c8ed9a78438827f1d80ff4aa, especially to add the missing Diff:$ diff -u <(bashbrew cat drupal) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2021-01-26 14:48:49.125779063 -0800
+++ /dev/fd/62 2021-01-26 14:48:49.125779063 -0800
@@ -1,62 +1,77 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/drupal.git
-Tags: 9.1.3-apache-buster, 9.1-apache-buster, 9-apache-buster, apache-buster, 9.1.3-apache, 9.1-apache, 9-apache, apache, 9.1.3, 9.1, 9, latest
+Tags: 9.1.3-php8.0-apache-buster, 9.1-php8.0-apache-buster, 9-php8.0-apache-buster, php8.0-apache-buster, 9.1.3-php8.0-apache, 9.1-php8.0-apache, 9-php8.0-apache, php8.0-apache, 9.1.3-apache-buster, 9.1-apache-buster, 9-apache-buster, apache-buster, 9.1.3-apache, 9.1-apache, 9-apache, apache, 9.1.3, 9.1, 9, latest, 9.1.3-php8.0, 9.1-php8.0, 9-php8.0, php8.0
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/apache-buster
-Tags: 9.1.3-fpm-buster, 9.1-fpm-buster, 9-fpm-buster, fpm-buster, 9.1.3-fpm, 9.1-fpm, 9-fpm, fpm
+Tags: 9.1.3-php8.0-fpm-buster, 9.1-php8.0-fpm-buster, 9-php8.0-fpm-buster, php8.0-fpm-buster, 9.1.3-php8.0-fpm, 9.1-php8.0-fpm, 9-php8.0-fpm, php8.0-fpm, 9.1.3-fpm-buster, 9.1-fpm-buster, 9-fpm-buster, fpm-buster, 9.1.3-fpm, 9.1-fpm, 9-fpm, fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/fpm-buster
-Tags: 9.1.3-fpm-alpine3.12, 9.1-fpm-alpine3.12, 9-fpm-alpine3.12, fpm-alpine3.12, 9.1.3-fpm-alpine, 9.1-fpm-alpine, 9-fpm-alpine, fpm-alpine
+Tags: 9.1.3-php8.0-fpm-alpine3.12, 9.1-php8.0-fpm-alpine3.12, 9-php8.0-fpm-alpine3.12, php8.0-fpm-alpine3.12, 9.1.3-php8.0-fpm-alpine, 9.1-php8.0-fpm-alpine, 9-php8.0-fpm-alpine, php8.0-fpm-alpine, 9.1.3-fpm-alpine3.12, 9.1-fpm-alpine3.12, 9-fpm-alpine3.12, fpm-alpine3.12, 9.1.3-fpm-alpine, 9.1-fpm-alpine, 9-fpm-alpine, fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/fpm-alpine3.12
-Tags: 9.0.11-apache-buster, 9.0-apache-buster, 9.0.11-apache, 9.0-apache, 9.0.11, 9.0
+Tags: 9.1.3-php7.4-apache-buster, 9.1-php7.4-apache-buster, 9-php7.4-apache-buster, php7.4-apache-buster, 9.1.3-php7.4-apache, 9.1-php7.4-apache, 9-php7.4-apache, php7.4-apache
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/apache-buster
-Tags: 9.0.11-fpm-buster, 9.0-fpm-buster, 9.0.11-fpm, 9.0-fpm
+Tags: 9.1.3-php7.4-fpm-buster, 9.1-php7.4-fpm-buster, 9-php7.4-fpm-buster, php7.4-fpm-buster, 9.1.3-php7.4-fpm, 9.1-php7.4-fpm, 9-php7.4-fpm, php7.4-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/fpm-buster
-Tags: 9.0.11-fpm-alpine3.12, 9.0-fpm-alpine3.12, 9.0.11-fpm-alpine, 9.0-fpm-alpine
+Tags: 9.1.3-php7.4-fpm-alpine3.12, 9.1-php7.4-fpm-alpine3.12, 9-php7.4-fpm-alpine3.12, php7.4-fpm-alpine3.12, 9.1.3-php7.4-fpm-alpine, 9.1-php7.4-fpm-alpine, 9-php7.4-fpm-alpine, php7.4-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/fpm-alpine3.12
-Tags: 8.9.13-apache-buster, 8.9-apache-buster, 8-apache-buster, 8.9.13-apache, 8.9-apache, 8-apache, 8.9.13, 8.9, 8
+Tags: 9.0.11-php7.4-apache-buster, 9.0-php7.4-apache-buster, 9.0.11-php7.4-apache, 9.0-php7.4-apache, 9.0.11-apache-buster, 9.0-apache-buster, 9.0.11-apache, 9.0-apache, 9.0.11, 9.0, 9.0.11-php7.4, 9.0-php7.4
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/apache-buster
-Tags: 8.9.13-fpm-buster, 8.9-fpm-buster, 8-fpm-buster, 8.9.13-fpm, 8.9-fpm, 8-fpm
+Tags: 9.0.11-php7.4-fpm-buster, 9.0-php7.4-fpm-buster, 9.0.11-php7.4-fpm, 9.0-php7.4-fpm, 9.0.11-fpm-buster, 9.0-fpm-buster, 9.0.11-fpm, 9.0-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/fpm-buster
-Tags: 8.9.13-fpm-alpine3.12, 8.9-fpm-alpine3.12, 8-fpm-alpine3.12, 8.9.13-fpm-alpine, 8.9-fpm-alpine, 8-fpm-alpine
+Tags: 9.0.11-php7.4-fpm-alpine3.12, 9.0-php7.4-fpm-alpine3.12, 9.0.11-php7.4-fpm-alpine, 9.0-php7.4-fpm-alpine, 9.0.11-fpm-alpine3.12, 9.0-fpm-alpine3.12, 9.0.11-fpm-alpine, 9.0-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/fpm-alpine3.12
-Tags: 7.78-apache-buster, 7-apache-buster, 7.78-apache, 7-apache, 7.78, 7
+Tags: 8.9.13-php7.4-apache-buster, 8.9-php7.4-apache-buster, 8-php7.4-apache-buster, 8.9.13-php7.4-apache, 8.9-php7.4-apache, 8-php7.4-apache, 8.9.13-apache-buster, 8.9-apache-buster, 8-apache-buster, 8.9.13-apache, 8.9-apache, 8-apache, 8.9.13, 8.9, 8, 8.9.13-php7.4, 8.9-php7.4, 8-php7.4
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/apache-buster
+
+Tags: 8.9.13-php7.4-fpm-buster, 8.9-php7.4-fpm-buster, 8-php7.4-fpm-buster, 8.9.13-php7.4-fpm, 8.9-php7.4-fpm, 8-php7.4-fpm, 8.9.13-fpm-buster, 8.9-fpm-buster, 8-fpm-buster, 8.9.13-fpm, 8.9-fpm, 8-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/fpm-buster
+
+Tags: 8.9.13-php7.4-fpm-alpine3.12, 8.9-php7.4-fpm-alpine3.12, 8-php7.4-fpm-alpine3.12, 8.9.13-php7.4-fpm-alpine, 8.9-php7.4-fpm-alpine, 8-php7.4-fpm-alpine, 8.9.13-fpm-alpine3.12, 8.9-fpm-alpine3.12, 8-fpm-alpine3.12, 8.9.13-fpm-alpine, 8.9-fpm-alpine, 8-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/fpm-alpine3.12
+
+Tags: 7.78-php7.4-apache-buster, 7-php7.4-apache-buster, 7.78-php7.4-apache, 7-php7.4-apache, 7.78-apache-buster, 7-apache-buster, 7.78-apache, 7-apache, 7.78, 7, 7.78-php7.4, 7-php7.4
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/apache-buster
-Tags: 7.78-fpm-buster, 7-fpm-buster, 7.78-fpm, 7-fpm
+Tags: 7.78-php7.4-fpm-buster, 7-php7.4-fpm-buster, 7.78-php7.4-fpm, 7-php7.4-fpm, 7.78-fpm-buster, 7-fpm-buster, 7.78-fpm, 7-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/fpm-buster
-Tags: 7.78-fpm-alpine3.12, 7-fpm-alpine3.12, 7.78-fpm-alpine, 7-fpm-alpine
+Tags: 7.78-php7.4-fpm-alpine3.12, 7-php7.4-fpm-alpine3.12, 7.78-php7.4-fpm-alpine, 7-php7.4-fpm-alpine, 7.78-fpm-alpine3.12, 7-fpm-alpine3.12, 7.78-fpm-alpine, 7-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/fpm-alpine3.12 |
tianon
approved these changes
Jan 26, 2021
tianon
added a commit
to docker-library/oi-janky-groovy
that referenced
this pull request
Jan 30, 2021
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jan 30, 2021
Changes: - docker-library/drupal@d73ee20: Merge pull request docker-library/drupal#190 from infosiftr/jq-template - docker-library/drupal@488c0c9: Auto-scrape Composer version from upstream composer.lock files - docker-library/drupal@1eca4a1: Add initial jq-based templating engine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to docker-library/php#1052
Add support for multiple php versions (like
9.1-php8.0-apache-busterand9.1-php7.4-apache-buster)Fixes #189