Skip to content

Add initial jq-based templating engine #262

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 1 commit into from
Oct 15, 2020

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Oct 9, 2020

Based on docker-library/php#1052 and related. Also finally drops windows support from scripts.

$ diff -u ../official-images/library/docker <(./generate-stackbrew-library.sh)
--- ../official-images/library/docker	2020-09-17 15:37:41.373613739 -0700
+++ /dev/fd/63	2020-10-09 16:33:41.320816453 -0700
@@ -1,4 +1,4 @@
-# this file is generated via https://github.com/docker-library/docker/blob/606c63960a4845af7077721eb3900c706f5d0c5e/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/docker/blob/dfced3292cb8cddaccac8365c4754a556f349809/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <[email protected]> (@tianon),
              Joseph Ferguson <[email protected]> (@yosifkit)
@@ -6,20 +6,20 @@
 
 Tags: 19.03.13, 19.03, 19, stable, test, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 66c83a536259775694aa5d316426f3ff3ddcda6e
+GitCommit: dfced3292cb8cddaccac8365c4754a556f349809
 Directory: 19.03
 
 Tags: 19.03.13-dind, 19.03-dind, 19-dind, stable-dind, test-dind, dind
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 93c19dff54de9876f736b3aa8026be5ad5987388
+GitCommit: dfced3292cb8cddaccac8365c4754a556f349809
 Directory: 19.03/dind
 
 Tags: 19.03.13-dind-rootless, 19.03-dind-rootless, 19-dind-rootless, stable-dind-rootless, test-dind-rootless, dind-rootless
 Architectures: amd64
-GitCommit: 399f205733e0162fe6f6529fad8f2231b843606e
+GitCommit: dfced3292cb8cddaccac8365c4754a556f349809
 Directory: 19.03/dind-rootless
 
 Tags: 19.03.13-git, 19.03-git, 19-git, stable-git, test-git, git
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 7a67842e7ff12c1426ae6a67ac1b7a701b51f3df
+GitCommit: dfced3292cb8cddaccac8365c4754a556f349809
 Directory: 19.03/git

}

# sort version numbers with highest first
#IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

versions.sh Outdated
export bashbrewArch url
doc="$(
jq <<<"$doc" -c '.arches[env.bashbrewArch] = {
dockerUrl: env.url,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dockerUrl: env.url,
dockerUrl: env.url,

versions.sh Outdated

# order here controls the order of the library/ file
for variant in \
"" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"" \
'' \

@tianon tianon merged commit 5373612 into docker-library:master Oct 15, 2020
@tianon tianon deleted the jq-template branch October 15, 2020 19:25
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Oct 15, 2020
Changes:

- docker-library/docker@5373612: Merge pull request docker-library/docker#262 from infosiftr/jq-template
- docker-library/docker@12d1c27: Add initial jq-based templating engine
@tianon tianon mentioned this pull request Jun 2, 2021
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