Browse Source

build: use uid of user building the build containers

master
Sander van Grieken 3 years ago committed by SomberNight
parent
commit
ab073827cf
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 4
      contrib/android/Dockerfile
  2. 2
      contrib/android/build.sh
  3. 4
      contrib/build-linux/appimage/Dockerfile
  4. 2
      contrib/build-linux/appimage/build.sh
  5. 4
      contrib/build-linux/sdist/Dockerfile
  6. 2
      contrib/build-linux/sdist/build.sh
  7. 4
      contrib/build-wine/Dockerfile
  8. 2
      contrib/build-wine/build.sh

4
contrib/android/Dockerfile

@ -2,6 +2,8 @@
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
ARG UID=1000
ENV DEBIAN_FRONTEND=noninteractive
ENV ANDROID_HOME="/opt/android"
@ -145,7 +147,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/android/build.sh

@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
CONTRIB="$PROJECT_ROOT/contrib"
CONTRIB_ANDROID="$CONTRIB/android"
DISTDIR="$PROJECT_ROOT/dist"
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
. "$CONTRIB"/build_tools_util.sh
@ -39,6 +40,7 @@ fi
info "building docker image."
docker build \
$DOCKER_BUILD_FLAGS \
--build-arg UID=$BUILD_UID \
-t electrum-android-builder-img \
--file "$CONTRIB_ANDROID/Dockerfile" \
"$PROJECT_ROOT"

4
contrib/build-linux/appimage/Dockerfile

@ -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

@ -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 vendored

@ -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 vendored

@ -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"

4
contrib/build-wine/Dockerfile

@ -1,5 +1,7 @@
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
ARG UID=1000
# need ca-certificates before using snapshot packages
RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
ca-certificates
@ -63,7 +65,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-wine/build.sh

@ -10,6 +10,7 @@ PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../.."
PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
CONTRIB="$PROJECT_ROOT/contrib"
CONTRIB_WINE="$CONTRIB/build-wine"
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
. "$CONTRIB"/build_tools_util.sh
@ -26,6 +27,7 @@ fi
info "building docker image."
docker build \
$DOCKER_BUILD_FLAGS \
--build-arg UID=$BUILD_UID \
-t electrum-wine-builder-img \
"$CONTRIB_WINE"

Loading…
Cancel
Save