docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add BASHBREW_GENERATE_SKIP_PGP_PROXY variable to skip pgp-happy-eyeballs

This commit is contained in:
Tianon Gravi 2021-08-26 16:06:30 -07:00
parent a4a65a7293
commit a690dddbea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/github-actions/generate.sh
View File

@ -158,22 +158,22 @@ strategy="$(
"git clone --depth 1 https://github.com/docker-library/official-images.git -b master ~/oi", "git clone --depth 1 https://github.com/docker-library/official-images.git -b master ~/oi",
"# create a dummy empty image/layer so we can --filter since= later to get a meaningful image list", "# create a dummy empty image/layer so we can --filter since= later to get a meaningful image list",
"{ echo FROM " + ( "{ echo FROM " + (
if (.os | startswith("windows-")) then if .os | startswith("windows-") then
"mcr.microsoft.com/windows/servercore:ltsc" + (.os | ltrimstr("windows-")) "mcr.microsoft.com/windows/servercore:ltsc" + (.os | ltrimstr("windows-"))
else else
"busybox:latest" "busybox:latest"
end end
) + "; echo RUN :; } | docker build --no-cache --tag image-list-marker -", ) + "; echo RUN :; } | docker build --no-cache --tag image-list-marker -",
( (
if .os | startswith("windows-") | not then if (env.BASHBREW_GENERATE_SKIP_PGP_PROXY) or (.os | startswith("windows-")) then
empty
else
( (
"# PGP Happy Eyeballs", "# PGP Happy Eyeballs",
"git clone --depth 1 https://github.com/tianon/pgp-happy-eyeballs.git ~/phe", "git clone --depth 1 https://github.com/tianon/pgp-happy-eyeballs.git ~/phe",
"~/phe/hack-my-builds.sh", "~/phe/hack-my-builds.sh",
"rm -rf ~/phe" "rm -rf ~/phe"
) )
else
empty
end end
) )
] | join("\n")), ] | join("\n")),