Update templating to pin to only major version and use a single template#94
Merged
yosifkit merged 1 commit intodocker-library:masterfrom Dec 8, 2023
Merged
Conversation
Member
Author
Diff:$ diff -u <(wget -qO- 'https://github.com/docker-library-bot/official-images/raw/152c3b704c139f0bfc7a006a510f79e590328af0/library/memcached') <(./generate-stackbrew-library.sh)
--- /dev/fd/63 2023-12-01 16:52:33.625429303 -0800
+++ /dev/fd/62 2023-12-01 16:52:33.625429303 -0800
@@ -1,4 +1,4 @@
-# this file is generated via https://github.com/docker-library/memcached/blob/3e552dc7c3907467c258c986cb4763a544ee3041/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/memcached/blob/abaef90ed3a87545d0cca915444f24e063c62140/generate-stackbrew-library.sh
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
@@ -6,10 +6,10 @@
Tags: 1.6.22, 1.6, 1, latest, 1.6.22-bookworm, 1.6-bookworm, 1-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8a7264e4fc952fd71f2fe325908d6ba06e8e061
-Directory: debian
+GitCommit: abaef90ed3a87545d0cca915444f24e063c62140
+Directory: 1/debian
Tags: 1.6.22-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.22-alpine3.18, 1.6-alpine3.18, 1-alpine3.18, alpine3.18
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b8a7264e4fc952fd71f2fe325908d6ba06e8e061
-Directory: alpine
+GitCommit: abaef90ed3a87545d0cca915444f24e063c62140
+Directory: 1/alpine |
It's extremely unlikely that memcached is going to maintain more than one major version at a time (even that seems to be a bit much sometimes, which is relatable). This also converts the Dockerfiles to use semicolons instead of `&&` chains (see https://github.com/docker-library/memcached/compare/b8a7264..00003b7 to compare this without that conversion). Additionally, this 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.
tianon
commented
Dec 4, 2023
Comment on lines
+48
to
50
| gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ | ||
| ./configure \ | ||
| --build="$gnuArch" \ |
Member
Author
There was a problem hiding this comment.
This is a bug we didn't catch before now because we weren't using set -u 😂 😅
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 9, 2023
Changes: - docker-library/memcached@471a298: Update 1 to alpine 3.19 - docker-library/memcached@9cd87ed: Merge pull request docker-library/memcached#94 from infosiftr/one-template - docker-library/memcached@52c3fa2: Update templating to pin to only major version and use a single template - docker-library/memcached@1cd4fbf: Merge pull request docker-library/memcached#93 from LaurentGoderre/templating - docker-library/memcached@8b76567: Implement jq templating
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
It's extremely unlikely that memcached is going to maintain more than one major version at a time (even that seems to be a bit much sometimes, which is relatable).
This also converts the Dockerfiles to use semicolons instead of
&&chains (see https://github.com/docker-library/memcached/compare/b8a7264..00003b7 to compare this without that conversion).Additionally, this 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.
See also docker-library/php#1052 (and linked PRs).
Follow up to #93