Skip to content

Commit f1a842c

Browse files
committed
Fix Microsoft signing keys for Debian Trixie in docker-*
1 parent 0c61683 commit f1a842c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/docker-in-docker/install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1818
INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
1919
INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
2020
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
21+
MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
2122
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
2223
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble"
2324
DISABLE_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
238242
else
239243
# Name of licensed engine/cli

src/docker-outside-of-docker/install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
1818
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1919
INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
2020
INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
21-
2221
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
22+
MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
2323
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble plucky"
2424
DOCKER_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
229232
else
230233
# Name of proprietary engine package

0 commit comments

Comments
 (0)