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

Add initial jq-based templating engine #471

Merged
merged 1 commit into from
May 15, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented May 14, 2021

See also docker-library/php#1052 (and linked PRs).

@tianon
Copy link
Member Author

tianon commented May 14, 2021

I generated a bashbrew cat diff using https://github.com/docker-library/official-images/blob/e74671a75e071954f41dc8f82edf57a570047447/_bashbrew-cat-sorted.sh, which makes it obvious that 77e6657 is the only real change, as expected. 😄

Diff:
--- before.txt	2021-05-14 14:38:10.087499175 -0700
+++ after.txt	2021-05-14 14:38:36.110783246 -0700
@@ -1,82 +1,62 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/mongo.git
 
-Tags: 3.6.23-windowsservercore-1809, 3.6-windowsservercore-1809, 3-windowsservercore-1809
-SharedTags: 3.6.23-windowsservercore, 3.6-windowsservercore, 3-windowsservercore, 3.6.23, 3.6, 3
-Architectures: windows-amd64
-GitCommit: 38648d9dddd6a6f87f0d47885bf6525c20b63557
-Directory: 3.6/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 3.6.23-windowsservercore-ltsc2016, 3.6-windowsservercore-ltsc2016, 3-windowsservercore-ltsc2016
-SharedTags: 3.6.23-windowsservercore, 3.6-windowsservercore, 3-windowsservercore, 3.6.23, 3.6, 3
-Architectures: windows-amd64
-GitCommit: 38648d9dddd6a6f87f0d47885bf6525c20b63557
-Directory: 3.6/windows/windowsservercore-ltsc2016
-Constraints: windowsservercore-ltsc2016
-
-Tags: 3.6.23-xenial, 3.6-xenial, 3-xenial
-SharedTags: 3.6.23, 3.6, 3
-Architectures: amd64, arm64v8
-GitCommit: b9073238e2a724f76e5f587a663baa55ab902e26
-Directory: 3.6
-
 Tags: 4.0.24-windowsservercore-1809, 4.0-windowsservercore-1809
 SharedTags: 4.0.24-windowsservercore, 4.0-windowsservercore, 4.0.24, 4.0
 Architectures: windows-amd64
-GitCommit: 8806928aa5596f4b310dc2d9371a6e153f18d3b4
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.0/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 4.0.24-windowsservercore-ltsc2016, 4.0-windowsservercore-ltsc2016
 SharedTags: 4.0.24-windowsservercore, 4.0-windowsservercore, 4.0.24, 4.0
 Architectures: windows-amd64
-GitCommit: 8806928aa5596f4b310dc2d9371a6e153f18d3b4
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.0/windows/windowsservercore-ltsc2016
 Constraints: windowsservercore-ltsc2016
 
 Tags: 4.0.24-xenial, 4.0-xenial
 SharedTags: 4.0.24, 4.0
 Architectures: amd64, arm64v8
-GitCommit: b9073238e2a724f76e5f587a663baa55ab902e26
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.0
 
 Tags: 4.2.14-bionic, 4.2-bionic
 SharedTags: 4.2.14, 4.2
 Architectures: amd64, arm64v8
-GitCommit: b9073238e2a724f76e5f587a663baa55ab902e26
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.2
 
 Tags: 4.2.14-windowsservercore-1809, 4.2-windowsservercore-1809
 SharedTags: 4.2.14-windowsservercore, 4.2-windowsservercore, 4.2.14, 4.2
 Architectures: windows-amd64
-GitCommit: d328982a097f4f1224a95097ede86a5b23b32ac8
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.2/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 4.2.14-windowsservercore-ltsc2016, 4.2-windowsservercore-ltsc2016
 SharedTags: 4.2.14-windowsservercore, 4.2-windowsservercore, 4.2.14, 4.2
 Architectures: windows-amd64
-GitCommit: d328982a097f4f1224a95097ede86a5b23b32ac8
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.2/windows/windowsservercore-ltsc2016
 Constraints: windowsservercore-ltsc2016
 
 Tags: 4.4.6-bionic, 4.4-bionic, 4-bionic, bionic
 SharedTags: 4.4.6, 4.4, 4, latest
 Architectures: amd64, arm64v8, s390x
-GitCommit: 447e058c5615b47aae283110c4f36c7ea48ccc2f
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.4
 
 Tags: 4.4.6-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809, windowsservercore-1809
 SharedTags: 4.4.6-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, windowsservercore, 4.4.6, 4.4, 4, latest
 Architectures: windows-amd64
-GitCommit: 447e058c5615b47aae283110c4f36c7ea48ccc2f
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.4/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 4.4.6-windowsservercore-ltsc2016, 4.4-windowsservercore-ltsc2016, 4-windowsservercore-ltsc2016, windowsservercore-ltsc2016
 SharedTags: 4.4.6-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, windowsservercore, 4.4.6, 4.4, 4, latest
 Architectures: windows-amd64
-GitCommit: 447e058c5615b47aae283110c4f36c7ea48ccc2f
+GitCommit: 791d400b9e84a298356b78db01956d98db973b9d
 Directory: 4.4/windows/windowsservercore-ltsc2016
 Constraints: windowsservercore-ltsc2016

@tianon
Copy link
Member Author

tianon commented May 14, 2021

(I plan to add 4.9-rc separately after this is reviewed/merged -- I've manually excluded it from this for now 👀)

@yosifkit yosifkit merged commit 7ae285a into docker-library:master May 15, 2021
@yosifkit yosifkit deleted the jq-template branch May 15, 2021 00:25
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request May 17, 2021
Changes:

- docker-library/mongo@b3edd5a: Merge pull request docker-library/mongo#472 from infosiftr/4.9-rc
- docker-library/mongo@2e9ea18: Add 4.9-rc
- docker-library/mongo@7ae285a: Merge pull request docker-library/mongo#471 from infosiftr/jq-template
- docker-library/mongo@791d400: Add initial jq-based templating engine
- docker-library/mongo@77e6657: Remove 3.6 (EOL)
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request May 17, 2021
Changes:

- docker-library/mongo@dc35ba5: Add nanoserver-1809 container images using multi-stage builds (docker-library/mongo#470)
- docker-library/mongo@b3edd5a: Merge pull request docker-library/mongo#472 from infosiftr/4.9-rc
- docker-library/mongo@2e9ea18: Add 4.9-rc
- docker-library/mongo@7ae285a: Merge pull request docker-library/mongo#471 from infosiftr/jq-template
- docker-library/mongo@791d400: Add initial jq-based templating engine
- docker-library/mongo@77e6657: Remove 3.6 (EOL)
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request May 17, 2021
Changes:

- docker-library/mongo@6377a52: Fix Constraints again
- docker-library/mongo@7dadfcc: Add missing Constraints
- docker-library/mongo@dc35ba5: Add nanoserver-1809 container images using multi-stage builds (docker-library/mongo#470)
- docker-library/mongo@b3edd5a: Merge pull request docker-library/mongo#472 from infosiftr/4.9-rc
- docker-library/mongo@2e9ea18: Add 4.9-rc
- docker-library/mongo@7ae285a: Merge pull request docker-library/mongo#471 from infosiftr/jq-template
- docker-library/mongo@791d400: Add initial jq-based templating engine
- docker-library/mongo@77e6657: Remove 3.6 (EOL)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants