diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rwxr-xr-x | docker/bin/buildpackage.sh | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f7b5e7f..9decea7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,13 +10,16 @@ RUN pacman --noconfirm -Syu RUN pacman --noconfirm -S git sudo RUN groupadd sudo -RUN useradd -G sudo -d /workdir -m aurbuilder +RUN useradd --groups sudo --home-dir /workdir --create-home --user-group --system aurbuilder COPY --chown=root:root sudoers /etc/sudoers RUN mkdir /pkgout VOLUME /pkgout +RUN mkdir /pkgdest +RUN chown aurbuilder:aurbuilder /pkgdest + RUN pacman --noconfirm -S python python-requests RUN mkdir -p /opt/aurbuilder diff --git a/docker/bin/buildpackage.sh b/docker/bin/buildpackage.sh index ace52fd..a1dd8c3 100755 --- a/docker/bin/buildpackage.sh +++ b/docker/bin/buildpackage.sh @@ -3,6 +3,8 @@ echo "BUILDING: $PACKAGE_NAME" echo "PACKAGER: $PACKAGER" +INTERMED_DEST="/pkgdest" + cd /workdir || exit 1 while read -r NAME BASE VER _; do @@ -15,12 +17,13 @@ while read -r NAME BASE VER _; do continue fi - sudo -u aurbuilder git clone "https://aur.archlinux.org/$BASE.git" "$BASE" + sudo --user=aurbuilder \ + git clone "https://aur.archlinux.org/$BASE.git" "$BASE" cd "$BASE" || exit 1 - sudo -u aurbuilder CARCH="$ARCH" PACKAGER="$PACKAGER" PKGDEST="/pkgout/" \ + sudo -u aurbuilder CARCH="$ARCH" PACKAGER="$PACKAGER" PKGDEST="$INTERMED_DEST" \ makepkg --force --syncdeps --noconfirm --install - #cp ./*.pkg.tar.zst /pkgout - test -n "$CHOWN" && sudo chown "$CHOWN" "/pkgout/${OUTNAME}"* + cp --no-preserve=ownership "$INTERMED_DEST/"*.pkg.tar.zst /pkgout + #test -n "$CHOWN" && sudo chown "$CHOWN" "/pkgout/${OUTNAME}"* done <<< "$(getpackage.py "$PACKAGE_NAME")" |