Update templating to use a single template #389
Merged
Conversation
This file contains 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
This also converts us to just two variants and auto-detects the latest Alpine/Debian, since we don't have a good reason to support more than one of each Debian and Alpine. Additionally, this auto-scrapes the list of checksums and supported architectures for `gosu` from the upstream project (since if we're going to embed the version in `versions.json`, we might as well go all the way and pre-scrape whatever data we possibly can), and switches to use `gosu` consistently between variants (given the state of `su-exec`).
Diff:$ diff -u <(wget -qO- 'https://github.com/docker-library-bot/official-images/raw/c9b5d6decd3c7d79d55ff16824bff2f57c5b74d7/library/redis') <(./generate-stackbrew-library.sh)
--- /dev/fd/63 2023-12-04 14:53:39.123011971 -0800
+++ /dev/fd/62 2023-12-04 14:53:39.127012007 -0800
@@ -1,45 +1,45 @@
-# this file is generated via https://github.com/docker-library/redis/blob/9b538c33746872dcd1e8c809cbde9f21ac2ec3ac/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/redis/blob/76c393fd8ac537201fe4bc4f200b4b5daee03f24/generate-stackbrew-library.sh
Maintainers: Tianon Gravi <[email protected]> (@tianon),
Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/redis.git
-Tags: 7.2.2, 7.2, 7, latest, 7.2.2-bookworm, 7.2-bookworm, 7-bookworm, bookworm
+Tags: 7.2.3, 7.2, 7, latest, 7.2.3-bookworm, 7.2-bookworm, 7-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f00ff0562e52e24f0cde26988628ad7de51fd8d8
-Directory: 7.2
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
+Directory: 7.2/debian
-Tags: 7.2.2-alpine, 7.2-alpine, 7-alpine, alpine, 7.2.2-alpine3.18, 7.2-alpine3.18, 7-alpine3.18, alpine3.18
+Tags: 7.2.3-alpine, 7.2-alpine, 7-alpine, alpine, 7.2.3-alpine3.18, 7.2-alpine3.18, 7-alpine3.18, alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f00ff0562e52e24f0cde26988628ad7de51fd8d8
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
Directory: 7.2/alpine
Tags: 7.0.14, 7.0, 7.0.14-bookworm, 7.0-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ce25672f1723a6851c7a884c9f860117746c34ed
-Directory: 7.0
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
+Directory: 7.0/debian
Tags: 7.0.14-alpine, 7.0-alpine, 7.0.14-alpine3.18, 7.0-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ce25672f1723a6851c7a884c9f860117746c34ed
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
Directory: 7.0/alpine
Tags: 6.2.14, 6.2, 6, 6.2.14-bookworm, 6.2-bookworm, 6-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1bca8586ef48732eca80d1ae4823145689f2f906
-Directory: 6.2
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
+Directory: 6.2/debian
Tags: 6.2.14-alpine, 6.2-alpine, 6-alpine, 6.2.14-alpine3.18, 6.2-alpine3.18, 6-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1bca8586ef48732eca80d1ae4823145689f2f906
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
Directory: 6.2/alpine
Tags: 6.0.20, 6.0, 6.0.20-bookworm, 6.0-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 873a7cac27da5a275d0c1e0c7d41724ae2701071
-Directory: 6.0
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
+Directory: 6.0/debian
Tags: 6.0.20-alpine, 6.0-alpine, 6.0.20-alpine3.18, 6.0-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 873a7cac27da5a275d0c1e0c7d41724ae2701071
+GitCommit: 76c393fd8ac537201fe4bc4f200b4b5daee03f24
Directory: 6.0/alpine |
LaurentGoderre
approved these changes
Dec 5, 2023
yosifkit
approved these changes
Dec 8, 2023
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Dec 8, 2023
Changes: - redis/docker-library-redis@dbde5b5: Update 7.2 to alpine 3.19 - redis/docker-library-redis@d305d4a: Update 7.0 to alpine 3.19 - redis/docker-library-redis@531cfa5: Update 6.2 to alpine 3.19 - redis/docker-library-redis@ac5605e: Update 6.0 to alpine 3.19 - redis/docker-library-redis@403df24: Merge pull request redis/docker-library-redis#389 from infosiftr/one-template - redis/docker-library-redis@76c393f: Update templating to use a single template
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.
This also converts us to just two variants and auto-detects the latest Alpine/Debian, since we don't have a good reason to support more than one of each Debian and Alpine.
Additionally, this auto-scrapes the list of checksums and supported architectures for
gosufrom the upstream project (since if we're going to embed the version inversions.json, we might as well go all the way and pre-scrape whatever data we possibly can), and switches to usegosuconsistently between variants (given the state ofsu-exec).See also docker-library/php#1052 (and linked PRs) and docker-library/memcached#94
Follow up to #379
Closes #385