build: use uid of user building the build containers
This commit is contained in:
committed by
SomberNight
parent
08ae0a73b2
commit
ab073827cf
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
||||||
|
|
||||||
|
ARG UID=1000
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
ENV ANDROID_HOME="/opt/android"
|
ENV ANDROID_HOME="/opt/android"
|
||||||
@@ -145,7 +147,7 @@ ENV USER="user"
|
|||||||
ENV HOME_DIR="/home/${USER}"
|
ENV HOME_DIR="/home/${USER}"
|
||||||
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
||||||
PATH="${HOME_DIR}/.local/bin:${PATH}"
|
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 usermod -append --groups sudo ${USER}
|
||||||
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||||
WORKDIR ${WORK_DIR}
|
WORKDIR ${WORK_DIR}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
|
|||||||
CONTRIB="$PROJECT_ROOT/contrib"
|
CONTRIB="$PROJECT_ROOT/contrib"
|
||||||
CONTRIB_ANDROID="$CONTRIB/android"
|
CONTRIB_ANDROID="$CONTRIB/android"
|
||||||
DISTDIR="$PROJECT_ROOT/dist"
|
DISTDIR="$PROJECT_ROOT/dist"
|
||||||
|
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
|
||||||
|
|
||||||
. "$CONTRIB"/build_tools_util.sh
|
. "$CONTRIB"/build_tools_util.sh
|
||||||
|
|
||||||
@@ -39,6 +40,7 @@ fi
|
|||||||
info "building docker image."
|
info "building docker image."
|
||||||
docker build \
|
docker build \
|
||||||
$DOCKER_BUILD_FLAGS \
|
$DOCKER_BUILD_FLAGS \
|
||||||
|
--build-arg UID=$BUILD_UID \
|
||||||
-t electrum-android-builder-img \
|
-t electrum-android-builder-img \
|
||||||
--file "$CONTRIB_ANDROID/Dockerfile" \
|
--file "$CONTRIB_ANDROID/Dockerfile" \
|
||||||
"$PROJECT_ROOT"
|
"$PROJECT_ROOT"
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
|
FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
|
||||||
|
|
||||||
|
ARG UID=1000
|
||||||
|
|
||||||
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
|
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
@@ -75,7 +77,7 @@ ENV USER="user"
|
|||||||
ENV HOME_DIR="/home/${USER}"
|
ENV HOME_DIR="/home/${USER}"
|
||||||
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
||||||
PATH="${HOME_DIR}/.local/bin:${PATH}"
|
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 usermod -append --groups sudo ${USER}
|
||||||
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||||
WORKDIR ${WORK_DIR}
|
WORKDIR ${WORK_DIR}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
|
|||||||
CONTRIB="$PROJECT_ROOT/contrib"
|
CONTRIB="$PROJECT_ROOT/contrib"
|
||||||
CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
|
CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
|
||||||
DISTDIR="$PROJECT_ROOT/dist"
|
DISTDIR="$PROJECT_ROOT/dist"
|
||||||
|
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
|
||||||
|
|
||||||
. "$CONTRIB"/build_tools_util.sh
|
. "$CONTRIB"/build_tools_util.sh
|
||||||
|
|
||||||
@@ -24,6 +25,7 @@ fi
|
|||||||
info "building docker image."
|
info "building docker image."
|
||||||
docker build \
|
docker build \
|
||||||
$DOCKER_BUILD_FLAGS \
|
$DOCKER_BUILD_FLAGS \
|
||||||
|
--build-arg UID=$BUILD_UID \
|
||||||
-t electrum-appimage-builder-img \
|
-t electrum-appimage-builder-img \
|
||||||
"$CONTRIB_APPIMAGE"
|
"$CONTRIB_APPIMAGE"
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
||||||
|
|
||||||
|
ARG UID=1000
|
||||||
|
|
||||||
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
|
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
@@ -22,7 +24,7 @@ ENV USER="user"
|
|||||||
ENV HOME_DIR="/home/${USER}"
|
ENV HOME_DIR="/home/${USER}"
|
||||||
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
||||||
PATH="${HOME_DIR}/.local/bin:${PATH}"
|
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 usermod -append --groups sudo ${USER}
|
||||||
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||||
WORKDIR ${WORK_DIR}
|
WORKDIR ${WORK_DIR}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
|
|||||||
CONTRIB="$PROJECT_ROOT/contrib"
|
CONTRIB="$PROJECT_ROOT/contrib"
|
||||||
CONTRIB_SDIST="$CONTRIB/build-linux/sdist"
|
CONTRIB_SDIST="$CONTRIB/build-linux/sdist"
|
||||||
DISTDIR="$PROJECT_ROOT/dist"
|
DISTDIR="$PROJECT_ROOT/dist"
|
||||||
|
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
|
||||||
|
|
||||||
. "$CONTRIB"/build_tools_util.sh
|
. "$CONTRIB"/build_tools_util.sh
|
||||||
|
|
||||||
@@ -24,6 +25,7 @@ fi
|
|||||||
info "building docker image."
|
info "building docker image."
|
||||||
docker build \
|
docker build \
|
||||||
$DOCKER_BUILD_FLAGS \
|
$DOCKER_BUILD_FLAGS \
|
||||||
|
--build-arg UID=$BUILD_UID \
|
||||||
-t electrum-sdist-builder-img \
|
-t electrum-sdist-builder-img \
|
||||||
"$CONTRIB_SDIST"
|
"$CONTRIB_SDIST"
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
|
||||||
|
|
||||||
|
ARG UID=1000
|
||||||
|
|
||||||
# need ca-certificates before using snapshot packages
|
# need ca-certificates before using snapshot packages
|
||||||
RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
|
RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
|
||||||
ca-certificates
|
ca-certificates
|
||||||
@@ -63,7 +65,7 @@ ENV USER="user"
|
|||||||
ENV HOME_DIR="/home/${USER}"
|
ENV HOME_DIR="/home/${USER}"
|
||||||
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
ENV WORK_DIR="${HOME_DIR}/wspace" \
|
||||||
PATH="${HOME_DIR}/.local/bin:${PATH}"
|
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 usermod -append --groups sudo ${USER}
|
||||||
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||||
WORKDIR ${WORK_DIR}
|
WORKDIR ${WORK_DIR}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../.."
|
|||||||
PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
|
PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
|
||||||
CONTRIB="$PROJECT_ROOT/contrib"
|
CONTRIB="$PROJECT_ROOT/contrib"
|
||||||
CONTRIB_WINE="$CONTRIB/build-wine"
|
CONTRIB_WINE="$CONTRIB/build-wine"
|
||||||
|
BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
|
||||||
|
|
||||||
. "$CONTRIB"/build_tools_util.sh
|
. "$CONTRIB"/build_tools_util.sh
|
||||||
|
|
||||||
@@ -26,6 +27,7 @@ fi
|
|||||||
info "building docker image."
|
info "building docker image."
|
||||||
docker build \
|
docker build \
|
||||||
$DOCKER_BUILD_FLAGS \
|
$DOCKER_BUILD_FLAGS \
|
||||||
|
--build-arg UID=$BUILD_UID \
|
||||||
-t electrum-wine-builder-img \
|
-t electrum-wine-builder-img \
|
||||||
"$CONTRIB_WINE"
|
"$CONTRIB_WINE"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user