AaronFiore/electrum
1
0
Fork 0
Code Activity

build: use uid of user building the build containers

Browse Source
This commit is contained in:
Sander van Grieken
2023-03-19 14:29:29 +01:00
committed by SomberNight
parent 08ae0a73b2
commit ab073827cf
8 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/build-linux/appimage/Dockerfile
View File

@@ -4,6 +4,8 @@
FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
ARG UID=1000
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
@@ -75,7 +77,7 @@ ENV USER="user"
ENV HOME_DIR="/home/${USER}"
ENV WORK_DIR="${HOME_DIR}/wspace" \
PATH="${HOME_DIR}/.local/bin:${PATH}"
RUN useradd --create-home --shell /bin/bash ${USER}
RUN useradd --uid $UID --create-home --shell /bin/bash ${USER}
RUN usermod -append --groups sudo ${USER}
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
WORKDIR ${WORK_DIR}

2
contrib/build-linux/appimage/build.sh
View File

@@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
CONTRIB="$PROJECT_ROOT/contrib"
CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
DISTDIR="$PROJECT_ROOT/dist"
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
. "$CONTRIB"/build_tools_util.sh
@@ -24,6 +25,7 @@ fi
info "building docker image."
docker build \
$DOCKER_BUILD_FLAGS \
--build-arg UID=$BUILD_UID \
-t electrum-appimage-builder-img \
"$CONTRIB_APPIMAGE"

4
contrib/build-linux/sdist/Dockerfile
View File

@@ -1,5 +1,7 @@
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
ARG UID=1000
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
@@ -22,7 +24,7 @@ ENV USER="user"
ENV HOME_DIR="/home/${USER}"
ENV WORK_DIR="${HOME_DIR}/wspace" \
PATH="${HOME_DIR}/.local/bin:${PATH}"
RUN useradd --create-home --shell /bin/bash ${USER}
RUN useradd --uid $UID --create-home --shell /bin/bash ${USER}
RUN usermod -append --groups sudo ${USER}
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
WORKDIR ${WORK_DIR}

2
contrib/build-linux/sdist/build.sh
View File

@@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
CONTRIB="$PROJECT_ROOT/contrib"
CONTRIB_SDIST="$CONTRIB/build-linux/sdist"
DISTDIR="$PROJECT_ROOT/dist"
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
. "$CONTRIB"/build_tools_util.sh
@@ -24,6 +25,7 @@ fi
info "building docker image."
docker build \
$DOCKER_BUILD_FLAGS \
--build-arg UID=$BUILD_UID \
-t electrum-sdist-builder-img \
"$CONTRIB_SDIST"