Skip to content

Commit 2f39516

Browse files
committed
Debian keyring .gpg are symlinks to .pgp, use cp to copy the actual content
1 parent fe426e0 commit 2f39516

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

  • src/azurelinux/3.0

src/azurelinux/3.0/net10.0/crossdeps-builder/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN gpg --import dimitri_john_ledkov.asc && \
7070
sha512sum -c SHA512SUMS.txt && \
7171
# 4. Install the needed keyrings and delete the rest
7272
mkdir -p /usr/share/keyrings && \
73-
mv keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
73+
cp keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
7474
cp keyrings/ubuntu-archive-removed-keys.gpg /usr/share/keyrings/ubuntu-archive-removed-keys.gpg && \
7575
# 5. Include removed archive keys for older Ubuntu release signatures (for example, xenial).
7676
cat /usr/share/keyrings/ubuntu-archive-removed-keys.gpg >> /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
@@ -86,7 +86,7 @@ RUN wget https://netcorenativeassets.blob.core.windows.net/resource-packages/ext
8686
# 2. Install the needed keyrings and delete the rest
8787
pushd debian-keyring && \
8888
mkdir -p /usr/share/keyrings && \
89-
mv keyrings/debian-archive-keyring.gpg /usr/share/keyrings/debian-archive-keyring.gpg && \
89+
cp keyrings/debian-archive-keyring.gpg /usr/share/keyrings/debian-archive-keyring.gpg && \
9090
cp keyrings/debian-archive-removed-keys.gpg /usr/share/keyrings/debian-archive-removed-keys.gpg && \
9191
# 3. Include removed archive keys for older Debian release signatures
9292
cat /usr/share/keyrings/debian-archive-removed-keys.gpg >> /usr/share/keyrings/debian-archive-keyring.gpg && \

src/azurelinux/3.0/net11.0/crossdeps-builder/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN gpg --import dimitri_john_ledkov.asc && \
6767
sha512sum -c SHA512SUMS.txt && \
6868
# 4. Install the needed keyrings and delete the rest
6969
mkdir -p /usr/share/keyrings && \
70-
mv keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
70+
cp keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
7171
cp keyrings/ubuntu-archive-removed-keys.gpg /usr/share/keyrings/ubuntu-archive-removed-keys.gpg && \
7272
# 5. Include removed archive keys for older Ubuntu release signatures (for example, xenial).
7373
cat /usr/share/keyrings/ubuntu-archive-removed-keys.gpg >> /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
@@ -83,7 +83,7 @@ RUN wget https://netcorenativeassets.blob.core.windows.net/resource-packages/ext
8383
# 2. Install the needed keyrings and delete the rest
8484
pushd debian-keyring && \
8585
mkdir -p /usr/share/keyrings && \
86-
mv keyrings/debian-archive-keyring.gpg /usr/share/keyrings/debian-archive-keyring.gpg && \
86+
cp keyrings/debian-archive-keyring.gpg /usr/share/keyrings/debian-archive-keyring.gpg && \
8787
cp keyrings/debian-archive-removed-keys.gpg /usr/share/keyrings/debian-archive-removed-keys.gpg && \
8888
# 3. Include removed archive keys for older Debian release signatures
8989
cat /usr/share/keyrings/debian-archive-removed-keys.gpg >> /usr/share/keyrings/debian-archive-keyring.gpg && \

0 commit comments

Comments
 (0)