OpenWRT
/
docker
mirror of https://github.com/openwrt/docker.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Dockerfile: fix GPG keys permission issues during container setup 

Currently the container initial setup using setup.sh fails:

  rm: cannot remove '/builder/keys/88CA59E8.asc': Permission denied
  rm: cannot remove '/builder/keys/CD54E82DADB3684D.asc': Permission denied
  rm: cannot remove '/builder/keys/2074BE7A.asc': Permission denied
  rm: cannot remove '/builder/keys/0x1D53D1877742E911.asc': Permission denied
  rm: cannot remove '/builder/keys/626471F1.asc': Permission denied

That is happening due to PEBKAC, where I didn't realized, that there is
such additional setup.sh happening. So lets fix it by adding the keys
with correct owner.

Link: https://github.com/openwrt/docker/pull/165
References: https://github.com/openwrt/packages/actions/runs/14242829383/job/39916509620?pr=26225
Fixes: #164
Fixes: 79999f3c7e ("Dockerfile: fix rootfs container generation")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
pull/165/head
Petr Štetiar 2025-04-03 15:54:04 +00:00
parent cda8065dc5
commit 648a9bd5ba
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -18,7 +18,7 @@ ENV VERSION_PATH=$VERSION_PATH
USER $USER USER $USER
WORKDIR $WORKDIR WORKDIR $WORKDIR
ADD keys/*.asc /builder/keys/ ADD --chown=buildbot:buildbot keys/*.asc /builder/keys/
COPY --chmod=0755 setup.sh /builder/setup.sh COPY --chmod=0755 setup.sh /builder/setup.sh
ARG RUN_SETUP=0 ARG RUN_SETUP=0

2
Dockerfile.rootfs
View File

@ -13,7 +13,7 @@ ENV VERSION_PATH=$VERSION_PATH
USER root USER root
WORKDIR /builder/rootfs WORKDIR /builder/rootfs
ADD keys/*.asc /builder/keys/ ADD --chown=buildbot:buildbot keys/*.asc /builder/keys/
COPY --chmod=0755 setup.sh /builder/setup.sh COPY --chmod=0755 setup.sh /builder/setup.sh
RUN /builder/setup.sh RUN /builder/setup.sh

2
setup.sh
View File

@ -10,7 +10,7 @@ DOWNLOAD_PATH="$VERSION_PATH/targets/$TARGET"
wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums" -O sha256sums wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums" -O sha256sums
wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums.asc" -O sha256sums.asc wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums.asc" -O sha256sums.asc
cat /builder/keys/*.asc | gpg --import && rm -rf /builder/keys/ gpg --import /builder/keys/*.asc && rm -rf /builder/keys/
gpg --with-fingerprint --verify sha256sums.asc sha256sums gpg --with-fingerprint --verify sha256sums.asc sha256sums
# determine archive name # determine archive name