-
Notifications
You must be signed in to change notification settings - Fork 46
Add initial jq-based templating engine #53
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
Merged
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
I applied the following change, so I could get a better diff from current to new: diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 4c6e0a3..577ba39 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -17,7 +17,7 @@ if [ "$#" -eq 0 ]; then
fi
# sort version numbers with highest first
-IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS
+#IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS
# get the most recent commit which modified any of "$@"
fileCommit() { Diff:$ diff -u <(bashbrew cat pypy) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2021-02-08 15:21:05.477809103 -0800
+++ /dev/fd/62 2021-02-08 15:21:05.477809103 -0800
@@ -3,30 +3,30 @@
Tags: 2.7-7.3.3, 2.7-7.3, 2.7-7, 2.7, 2-7.3.3, 2-7.3, 2-7, 2, 2.7-7.3.3-buster, 2.7-7.3-buster, 2.7-7-buster, 2.7-buster, 2-7.3.3-buster, 2-7.3-buster, 2-7-buster, 2-buster
Architectures: amd64, arm64v8, i386
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 2.7
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 2.7/buster
Tags: 2.7-7.3.3-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.3-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.3-slim-buster, 2.7-7.3-slim-buster, 2.7-7-slim-buster, 2.7-slim-buster, 2-7.3.3-slim-buster, 2-7.3-slim-buster, 2-7-slim-buster, 2-slim-buster
Architectures: amd64, arm64v8, i386
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 2.7/slim
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 2.7/slim-buster
Tags: 3.6-7.3.3, 3.6-7.3, 3.6-7, 3.6, 3-7.3.3, 3-7.3, 3-7, 3, latest, 3.6-7.3.3-buster, 3.6-7.3-buster, 3.6-7-buster, 3.6-buster, 3-7.3.3-buster, 3-7.3-buster, 3-7-buster, 3-buster, buster
Architectures: amd64, arm64v8, i386, s390x
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 3.6
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 3.6/buster
Tags: 3.6-7.3.3-slim, 3.6-7.3-slim, 3.6-7-slim, 3.6-slim, 3-7.3.3-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.6-7.3.3-slim-buster, 3.6-7.3-slim-buster, 3.6-7-slim-buster, 3.6-slim-buster, 3-7.3.3-slim-buster, 3-7.3-slim-buster, 3-7-slim-buster, 3-slim-buster, slim-buster
Architectures: amd64, arm64v8, i386, s390x
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 3.6/slim
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 3.6/slim-buster
Tags: 3.7-7.3.3, 3.7-7.3, 3.7-7, 3.7, 3.7-7.3.3-buster, 3.7-7.3-buster, 3.7-7-buster, 3.7-buster
Architectures: amd64, arm64v8, i386, s390x
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 3.7
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 3.7/buster
Tags: 3.7-7.3.3-slim, 3.7-7.3-slim, 3.7-7-slim, 3.7-slim, 3.7-7.3.3-slim-buster, 3.7-7.3-slim-buster, 3.7-7-slim-buster, 3.7-slim-buster
Architectures: amd64, arm64v8, i386, s390x
-GitCommit: 9625e09996380a78c53a9610915d839035245b57
-Directory: 3.7/slim
+GitCommit: 7f2fc5d31f8fecef999f26d11c5c8f1c95f1d93f
+Directory: 3.7/slim-buster |
To be transparent: the impetus for making this conversion was the additional patching we need to introduce from/for #49 (comment), but it generally simplifies (and allows us to add support for multiple Debian releases and potentially Windows in the future). |
yosifkit
approved these changes
Feb 17, 2021
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Feb 18, 2021
Changes: - docker-library/pypy@d660df9: Merge pull request docker-library/pypy#55 from infosiftr/thread-patch - docker-library/pypy@42286a6: Apply thread-related crypt patches in 3.x versions - docker-library/pypy@8b9d85c: Merge pull request docker-library/pypy#53 from infosiftr/jq-template - docker-library/pypy@76a4649: 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.
See also docker-library/php#1052 (and linked PRs).