File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed
Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1818INSTALL_DOCKER_BUILDX=" ${INSTALLDOCKERBUILDX:- " true" } "
1919INSTALL_DOCKER_COMPOSE_SWITCH=" ${INSTALLDOCKERCOMPOSESWITCH:- " true" } "
2020MICROSOFT_GPG_KEYS_URI=" https://packages.microsoft.com/keys/microsoft.asc"
21+ MICROSOFT_GPG_KEYS_ROLLING_URI=" https://packages.microsoft.com/keys/microsoft-rolling.asc"
2122DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES=" trixie bookworm buster bullseye bionic focal jammy noble"
2223DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES=" trixie bookworm buster bullseye bionic focal hirsute impish jammy noble"
2324DISABLE_IP6_TABLES=" ${DISABLEIP6TABLES:- false} "
@@ -233,7 +234,10 @@ if [ "${USE_MOBY}" = "true" ]; then
233234 cli_package_name=" moby-cli"
234235
235236 # Import key safely and import Microsoft apt repo
236- curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
237+ {
238+ curl -sSL ${MICROSOFT_GPG_KEYS_URI}
239+ curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
240+ } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
237241 echo " deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID} -${VERSION_CODENAME} -prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
238242else
239243 # Name of licensed engine/cli
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
1818USERNAME=" ${USERNAME:- " ${_REMOTE_USER:- " automatic" } " } "
1919INSTALL_DOCKER_BUILDX=" ${INSTALLDOCKERBUILDX:- " true" } "
2020INSTALL_DOCKER_COMPOSE_SWITCH=" ${INSTALLDOCKERCOMPOSESWITCH:- " true" } "
21-
2221MICROSOFT_GPG_KEYS_URI=" https://packages.microsoft.com/keys/microsoft.asc"
22+ MICROSOFT_GPG_KEYS_ROLLING_URI=" https://packages.microsoft.com/keys/microsoft-rolling.asc"
2323DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES=" trixie bookworm buster bullseye bionic focal jammy noble plucky"
2424DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES=" trixie bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
2525
@@ -224,7 +224,10 @@ if [ "${USE_MOBY}" = "true" ]; then
224224 cli_package_name=" moby-cli"
225225
226226 # Import key safely and import Microsoft apt repo
227- curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
227+ {
228+ curl -sSL ${MICROSOFT_GPG_KEYS_URI}
229+ curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
230+ } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
228231 echo " deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID} -${VERSION_CODENAME} -prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
229232else
230233 # Name of proprietary engine package
You can’t perform that action at this time.
0 commit comments