Repository: logging-log4net Updated Branches: refs/heads/develop 670c50178 -> 40606d321 refs/heads/feature/RollingFileAppender-NG 405c88edb -> c5bfa41fa
builder-netstandard: attempt to pass in the uid and gid of jenkins as docker build arg Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/720316ef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/720316ef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/720316ef Branch: refs/heads/feature/RollingFileAppender-NG Commit: 720316efb715e26670ee70e215424536c64d8a95 Parents: bfef11f Author: Dominik Psenner <[email protected]> Authored: Sun Jul 16 17:45:35 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Sun Jul 16 17:48:27 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 1 + buildtools/docker/build-builder-netstandard.sh | 13 ++++++++++++- buildtools/docker/builder-netstandard/Dockerfile | 16 ++++++++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/720316ef/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index 05ebb00..44bab25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { agent { dockerfile { dir 'buildtools/docker/builder-netstandard' + args "--build-arg JENKINS_UID=`stat -c \"%u\" buildtools` --build-arg JENKINS_UID=`stat -c \"%g\" buildtools`" reuseNode true } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/720316ef/buildtools/docker/build-builder-netstandard.sh ---------------------------------------------------------------------- diff --git a/buildtools/docker/build-builder-netstandard.sh b/buildtools/docker/build-builder-netstandard.sh index 79c9fb3..e3871c5 100755 --- a/buildtools/docker/build-builder-netstandard.sh +++ b/buildtools/docker/build-builder-netstandard.sh @@ -8,5 +8,16 @@ if [ -z "$MY_PATH" ] ; then exit 1 # fail fi -$MY_PATH/build.sh "builder-netstandard" +NAME="builder-netstandard" +JENKINS_UID=$2 +if [ -z "$JENKINS_UID" ] ; then + JENKINS_UID="`stat -c \"%u\" $0`" +fi + +JENKINS_GID=$3 +if [ -z "$JENKINS_GID" ] ; then + JENKINS_GID="`stat -c \"%g\" $0`" +fi + +docker build --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID --tag $NAME:latest $MY_PATH/$NAME http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/720316ef/buildtools/docker/builder-netstandard/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e00b1f2..5610806 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -1,16 +1,24 @@ # Name of container: docker-ubuntu-latest-nant FROM microsoft/dotnet +# define arguments +ARG JENKINS_UID +ARG JENKINS_GID + # set the maintainer of this docker image MAINTAINER "[email protected]" -# install dependencies -RUN apt-get update && apt-get install -y nant git +RUN echo "$(pwd)" +RUN echo $JENKINS_UID +RUN echo $JENKINS_GID # add custom workspace that can be written by anyone RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces # add jenkins user that maps to the custom workspace -RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN groupadd -r -g $JENKINS_GID jenkins-slave +RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JENKINS_UID --gid $JENKINS_GID --groups $JENKINS_GID -p -M jenkins + +# install dependencies +RUN apt-get update && apt-get install -y nant git
