diff --git a/Dockerfile b/Dockerfile index 1d1c87a..67614e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ ARG UBUNTU_VERSION=24.04 FROM ubuntu:${UBUNTU_VERSION} +ARG HOST_UID +ARG HOST_GID RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -10,7 +12,8 @@ RUN apt-get update \ WORKDIR /build COPY . src/ -RUN cd src && dpkg-buildpackage -us -uc -b \ - && mkdir /out \ +RUN cd src && dpkg-buildpackage -us -uc -b + +RUN mkdir /out \ && find /build -maxdepth 1 \( -name '*.deb' -o -name '*.buildinfo' -o -name '*.changes' \) \ - -exec mv {} /out/ \; + -exec install -o "$HOST_UID" -g "$HOST_GID" -m 0644 {} /out/ \; diff --git a/build.sh b/build.sh index da08959..7db49c3 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,7 @@ set -e mkdir -p out -container build -t cloud-router-builder "$@" . +container build --build-arg HOST_UID=$(id -u) --build-arg HOST_GID=$(id -g) -t cloud-router-builder "$@" . +container run --rm -v "$(pwd)/out:/mnt" cloud-router-builder sh -c 'cp -p /out/* /mnt/' echo "Build artifacts written to out/"