[08/12] logging-log4net git commit: builder-netstandard: base docker image on 1.1.2-sdk-jessie
builder-netstandard: base docker image on 1.1.2-sdk-jessie nant is available in jessie and we do not have to apply a hack. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fb4d9901 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fb4d9901 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fb4d9901 Branch: refs/heads/feature/netstandard-2.0 Commit: fb4d9901e039dd76cbeaedb284073eef43b2b231 Parents: 4c4a5c9 Author: Dominik PsennerAuthored: Sat Aug 19 10:53:46 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:53:46 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fb4d9901/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index b9c5f31..6fd683a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -1,5 +1,4 @@ -# Name of container: docker-ubuntu-latest-nant -FROM microsoft/dotnet +FROM microsoft/dotnet:1.1.2-sdk-jessie # define arguments passed in as environment variables ARG JENKINS_UID @@ -15,10 +14,6 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 -# HACK: add apt source to make nant available; -# the docker image is now based on debian stretch which no longer includes the nant package -RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list - # install dependencies RUN apt-get update && apt-get install -y nant git
[06/12] logging-log4net git commit: builder-netstandard: fixed typo
builder-netstandard: fixed typo Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ebfc7f50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ebfc7f50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ebfc7f50 Branch: refs/heads/feature/netstandard-2.0 Commit: ebfc7f507a61fdd8f6a4f1e90cb5a40515cf Parents: 652b9cb Author: Dominik PsennerAuthored: Sat Aug 19 10:39:39 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:39:39 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebfc7f50/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 7cde122..b9c5f31 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -17,7 +17,7 @@ RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JE # HACK: add apt source to make nant available; # the docker image is now based on debian stretch which no longer includes the nant package -echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list +RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list # install dependencies RUN apt-get update && apt-get install -y nant git
[01/12] logging-log4net git commit: builder-netstandard: added nant apt package source
Repository: logging-log4net Updated Branches: refs/heads/feature/netstandard-2.0 e666d9ea6 -> 8a43f89bb builder-netstandard: added nant apt package source The package source points to sid, thus allowing nant to be installed in debian stretch too. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/be2ae993 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/be2ae993 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/be2ae993 Branch: refs/heads/feature/netstandard-2.0 Commit: be2ae993df503bb563513d8637eb45b4fba16144 Parents: c7cf31f Author: Dominik PsennerAuthored: Sat Aug 19 10:03:21 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:03:21 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/be2ae993/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2dc5f54..2e7a109 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -18,6 +18,10 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 +# HACK: add apt source to make nant available; +# the docker image is now based on debian stretch which no longer includes the nant package +echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list + # install dependencies RUN apt-get update && apt-get install -y nant git
[09/12] logging-log4net git commit: builder-netstandard: renamed the builder to mention version 1.3
builder-netstandard: renamed the builder to mention version 1.3 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5edf53ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5edf53ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5edf53ae Branch: refs/heads/feature/netstandard-2.0 Commit: 5edf53ae675164d8b98f7c30f3f67ac2861b2e36 Parents: fb4d990 Author: Dominik PsennerAuthored: Sat Aug 19 11:05:47 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 11:05:47 2017 +0200 -- Jenkinsfile | 2 +- .../docker/build-builder-netstandard-1.3.sh | 23 buildtools/docker/build-builder-netstandard.sh | 23 .../docker/builder-netstandard-1.3/Dockerfile | 19 .../docker/builder-netstandard/Dockerfile | 19 .../docker/run-builder-netstandard-1.3.sh | 18 +++ buildtools/docker/run-builder-netstandard.sh| 18 --- 7 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 0a8fbe6..34cb27a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { steps { script { checkout scm - def builder_dir = "buildtools/docker/builder-netstandard" + def builder_dir = "buildtools/docker/builder-netstandard-1.3" // calculate args required to build the docker container def JENKINS_UID = sh ( http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/build-builder-netstandard-1.3.sh -- diff --git a/buildtools/docker/build-builder-netstandard-1.3.sh b/buildtools/docker/build-builder-netstandard-1.3.sh new file mode 100755 index 000..f1fc772 --- /dev/null +++ b/buildtools/docker/build-builder-netstandard-1.3.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +if [ -z "$MY_PATH" ] ; then + # error; for some reason, the path is not accessible + # to the script (e.g. permissions re-evaled after suid) + exit 1 # fail +fi + +NAME="builder-netstandard-1.3" +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/5edf53ae/buildtools/docker/build-builder-netstandard.sh -- diff --git a/buildtools/docker/build-builder-netstandard.sh b/buildtools/docker/build-builder-netstandard.sh deleted file mode 100755 index e3871c5..000 --- a/buildtools/docker/build-builder-netstandard.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -MY_PATH="`dirname \"$0\"`" # relative -MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized -if [ -z "$MY_PATH" ] ; then - # error; for some reason, the path is not accessible - # to the script (e.g. permissions re-evaled after suid) - exit 1 # fail -fi - -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/5edf53ae/buildtools/docker/builder-netstandard-1.3/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile new file mode 100644 index 000..6fd683a --- /dev/null +++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile @@ -0,0 +1,19 @@ +FROM microsoft/dotnet:1.1.2-sdk-jessie + +# define arguments passed in as environment variables +ARG JENKINS_UID +ARG JENKINS_GID + +# set the maintainer of this docker image +MAINTAINER "d...@logging.apache.org" + +# add custom workspace that can be written by anyone
[03/12] logging-log4net git commit: builder-netstandard: removed debug outputs
builder-netstandard: removed debug outputs Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/276eb816 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/276eb816 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/276eb816 Branch: refs/heads/feature/netstandard-2.0 Commit: 276eb81608f0a7647019871fc3fe3c6a15fa82e0 Parents: bab915d Author: Dominik PsennerAuthored: Sat Aug 19 10:09:07 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:09:07 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/276eb816/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2e7a109..7cde122 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -8,9 +8,6 @@ ARG JENKINS_GID # set the maintainer of this docker image MAINTAINER "d...@logging.apache.org" -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
[1/3] logging-log4net git commit: builder-netstandard: renamed the builder to mention version 1.3
Repository: logging-log4net Updated Branches: refs/heads/develop fb4d9901e -> 1db460bd9 builder-netstandard: renamed the builder to mention version 1.3 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5edf53ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5edf53ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5edf53ae Branch: refs/heads/develop Commit: 5edf53ae675164d8b98f7c30f3f67ac2861b2e36 Parents: fb4d990 Author: Dominik PsennerAuthored: Sat Aug 19 11:05:47 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 11:05:47 2017 +0200 -- Jenkinsfile | 2 +- .../docker/build-builder-netstandard-1.3.sh | 23 buildtools/docker/build-builder-netstandard.sh | 23 .../docker/builder-netstandard-1.3/Dockerfile | 19 .../docker/builder-netstandard/Dockerfile | 19 .../docker/run-builder-netstandard-1.3.sh | 18 +++ buildtools/docker/run-builder-netstandard.sh| 18 --- 7 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 0a8fbe6..34cb27a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { steps { script { checkout scm - def builder_dir = "buildtools/docker/builder-netstandard" + def builder_dir = "buildtools/docker/builder-netstandard-1.3" // calculate args required to build the docker container def JENKINS_UID = sh ( http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/build-builder-netstandard-1.3.sh -- diff --git a/buildtools/docker/build-builder-netstandard-1.3.sh b/buildtools/docker/build-builder-netstandard-1.3.sh new file mode 100755 index 000..f1fc772 --- /dev/null +++ b/buildtools/docker/build-builder-netstandard-1.3.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +if [ -z "$MY_PATH" ] ; then + # error; for some reason, the path is not accessible + # to the script (e.g. permissions re-evaled after suid) + exit 1 # fail +fi + +NAME="builder-netstandard-1.3" +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/5edf53ae/buildtools/docker/build-builder-netstandard.sh -- diff --git a/buildtools/docker/build-builder-netstandard.sh b/buildtools/docker/build-builder-netstandard.sh deleted file mode 100755 index e3871c5..000 --- a/buildtools/docker/build-builder-netstandard.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -MY_PATH="`dirname \"$0\"`" # relative -MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized -if [ -z "$MY_PATH" ] ; then - # error; for some reason, the path is not accessible - # to the script (e.g. permissions re-evaled after suid) - exit 1 # fail -fi - -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/5edf53ae/buildtools/docker/builder-netstandard-1.3/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile new file mode 100644 index 000..6fd683a --- /dev/null +++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile @@ -0,0 +1,19 @@ +FROM microsoft/dotnet:1.1.2-sdk-jessie + +# define arguments passed in as environment variables +ARG JENKINS_UID +ARG JENKINS_GID + +# set the maintainer of this docker image +MAINTAINER
[2/2] logging-log4net git commit: builder-netstandard: base docker image on 1.1.2-sdk-jessie
builder-netstandard: base docker image on 1.1.2-sdk-jessie nant is available in jessie and we do not have to apply a hack. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fb4d9901 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fb4d9901 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fb4d9901 Branch: refs/heads/develop Commit: fb4d9901e039dd76cbeaedb284073eef43b2b231 Parents: 4c4a5c9 Author: Dominik PsennerAuthored: Sat Aug 19 10:53:46 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:53:46 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fb4d9901/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index b9c5f31..6fd683a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -1,5 +1,4 @@ -# Name of container: docker-ubuntu-latest-nant -FROM microsoft/dotnet +FROM microsoft/dotnet:1.1.2-sdk-jessie # define arguments passed in as environment variables ARG JENKINS_UID @@ -15,10 +14,6 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 -# HACK: add apt source to make nant available; -# the docker image is now based on debian stretch which no longer includes the nant package -RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list - # install dependencies RUN apt-get update && apt-get install -y nant git
logging-log4net git commit: builder-netstandard: base docker image on 1.1.2-sdk-jessie
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 4c4a5c92b -> fb4d9901e builder-netstandard: base docker image on 1.1.2-sdk-jessie nant is available in jessie and we do not have to apply a hack. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fb4d9901 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fb4d9901 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fb4d9901 Branch: refs/heads/feature/cd-pipeline Commit: fb4d9901e039dd76cbeaedb284073eef43b2b231 Parents: 4c4a5c9 Author: Dominik PsennerAuthored: Sat Aug 19 10:53:46 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:53:46 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fb4d9901/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index b9c5f31..6fd683a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -1,5 +1,4 @@ -# Name of container: docker-ubuntu-latest-nant -FROM microsoft/dotnet +FROM microsoft/dotnet:1.1.2-sdk-jessie # define arguments passed in as environment variables ARG JENKINS_UID @@ -15,10 +14,6 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 -# HACK: add apt source to make nant available; -# the docker image is now based on debian stretch which no longer includes the nant package -RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list - # install dependencies RUN apt-get update && apt-get install -y nant git
[1/6] logging-log4net git commit: builder-netstandard: added nant apt package source
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline c7cf31f82 -> ebfc7f507 builder-netstandard: added nant apt package source The package source points to sid, thus allowing nant to be installed in debian stretch too. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/be2ae993 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/be2ae993 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/be2ae993 Branch: refs/heads/feature/cd-pipeline Commit: be2ae993df503bb563513d8637eb45b4fba16144 Parents: c7cf31f Author: Dominik PsennerAuthored: Sat Aug 19 10:03:21 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:03:21 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/be2ae993/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2dc5f54..2e7a109 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -18,6 +18,10 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 +# HACK: add apt source to make nant available; +# the docker image is now based on debian stretch which no longer includes the nant package +echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list + # install dependencies RUN apt-get update && apt-get install -y nant git
[3/6] logging-log4net git commit: builder-netstandard: removed debug outputs
builder-netstandard: removed debug outputs Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/276eb816 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/276eb816 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/276eb816 Branch: refs/heads/feature/cd-pipeline Commit: 276eb81608f0a7647019871fc3fe3c6a15fa82e0 Parents: bab915d Author: Dominik PsennerAuthored: Sat Aug 19 10:09:07 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:09:07 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/276eb816/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2e7a109..7cde122 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -8,9 +8,6 @@ ARG JENKINS_GID # set the maintainer of this docker image MAINTAINER "d...@logging.apache.org" -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
[6/6] logging-log4net git commit: builder-netstandard: fixed typo
builder-netstandard: fixed typo Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ebfc7f50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ebfc7f50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ebfc7f50 Branch: refs/heads/feature/cd-pipeline Commit: ebfc7f507a61fdd8f6a4f1e90cb5a40515cf Parents: 652b9cb Author: Dominik PsennerAuthored: Sat Aug 19 10:39:39 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:39:39 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebfc7f50/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 7cde122..b9c5f31 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -17,7 +17,7 @@ RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JE # HACK: add apt source to make nant available; # the docker image is now based on debian stretch which no longer includes the nant package -echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list +RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list # install dependencies RUN apt-get update && apt-get install -y nant git
[2/2] logging-log4net git commit: builder-netstandard: fixed typo
builder-netstandard: fixed typo Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ebfc7f50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ebfc7f50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ebfc7f50 Branch: refs/heads/develop Commit: ebfc7f507a61fdd8f6a4f1e90cb5a40515cf Parents: 652b9cb Author: Dominik PsennerAuthored: Sat Aug 19 10:39:39 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:39:39 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebfc7f50/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 7cde122..b9c5f31 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -17,7 +17,7 @@ RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JE # HACK: add apt source to make nant available; # the docker image is now based on debian stretch which no longer includes the nant package -echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list +RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list # install dependencies RUN apt-get update && apt-get install -y nant git
[2/2] logging-log4net git commit: builder-netstandard: removed debug outputs
builder-netstandard: removed debug outputs Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/276eb816 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/276eb816 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/276eb816 Branch: refs/heads/develop Commit: 276eb81608f0a7647019871fc3fe3c6a15fa82e0 Parents: bab915d Author: Dominik PsennerAuthored: Sat Aug 19 10:09:07 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:09:07 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/276eb816/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2e7a109..7cde122 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -8,9 +8,6 @@ ARG JENKINS_GID # set the maintainer of this docker image MAINTAINER "d...@logging.apache.org" -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
logging-log4net git commit: builder-netstandard: added nant apt package source
Repository: logging-log4net Updated Branches: refs/heads/develop c7cf31f82 -> be2ae993d builder-netstandard: added nant apt package source The package source points to sid, thus allowing nant to be installed in debian stretch too. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/be2ae993 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/be2ae993 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/be2ae993 Branch: refs/heads/develop Commit: be2ae993df503bb563513d8637eb45b4fba16144 Parents: c7cf31f Author: Dominik PsennerAuthored: Sat Aug 19 10:03:21 2017 +0200 Committer: Dominik Psenner Committed: Sat Aug 19 10:03:21 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/be2ae993/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2dc5f54..2e7a109 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -18,6 +18,10 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces 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 +# HACK: add apt source to make nant available; +# the docker image is now based on debian stretch which no longer includes the nant package +echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list + # install dependencies RUN apt-get update && apt-get install -y nant git
[34/50] [abbrv] logging-log4net git commit: builder-netstandard: build docker manually
builder-netstandard: build docker manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/db52f483 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/db52f483 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/db52f483 Branch: refs/heads/develop Commit: db52f48359955f50220f447482582de01e7cbece Parents: e08309e Author: Dominik PsennerAuthored: Tue Jul 18 19:31:10 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 19:31:10 2017 +0200 -- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/db52f483/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index fe262c3..d1bb794 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,9 @@ pipeline { echo "$JENKINS_GID" // build docker container - docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + dir ('buildtools/docker/netstandard/') { + docker.build 'builder-netstandard:latest', "--build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + } // run docker container // sh "docker run builder-netstandard:latest nant compile-netstandard"
[27/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to build the docker container manually
builder-netstandard: attempt to build the docker container manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b38985eb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b38985eb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b38985eb Branch: refs/heads/feature/RollingFileAppender-NG Commit: b38985eb77e24e812a014d0338c84de3cb2db42d Parents: fd7c10d Author: Dominik PsennerAuthored: Tue Jul 18 18:11:36 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 18:11:36 2017 +0200 -- Jenkinsfile | 38 .../docker/builder-netstandard/Dockerfile | 4 +-- 2 files changed, 25 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 10ce384..e833a45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,20 +27,12 @@ pipeline { agent { label 'ubuntu' } - environment { - JENKINS_UID = "null" - JENKINS_GID = "null" - } stages { // prepare node for builds stage('checkout') { steps { deleteDir() checkout scm - sh ''' - export JENKINS_UID=`stat -c "%u" .` - export JENKINS_GID=`stat -c "%g" .` - ''' } } @@ -53,17 +45,33 @@ pipeline { } } steps { - sh 'echo ${JENKINS_UID}' - sh 'echo ${JENKINS_GID}' + script { + checkout scm + + // calculate args required to build the docker container + def JENKINS_UID = sh ( + script: 'stat -c "%u" .', + returnStdout: true + ).trim() + def JENKINS_GID = sh ( + script: 'stat -c "%g" .', + returnStdout: true + ).trim() + + // build docker container + docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + + // run docker container + // sh "docker run builder-netstandard:latest nant compile-netstandard" + } - checkout scm // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + // sh 'nant compile-netstandard' + // stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - sh 'cd netstandard/log4net.tests && dotnet test' + // sh 'cd netstandard/log4net.tests && dotnet test' } } stage('build net-3.5') { @@ -218,7 +226,7 @@ pipeline { unstash 'mono-2.0-assemblies' unstash 'mono-3.5-assemblies' unstash 'mono-4.0-assemblies' - unstash 'netstandard-assemblies' + // unstash 'netstandard-assemblies' // unstash test results unstash 'net-3.5-testresults' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2c5f9dc..2dc5f54 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++
[26/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to build the docker container manually
builder-netstandard: attempt to build the docker container manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b38985eb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b38985eb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b38985eb Branch: refs/heads/develop Commit: b38985eb77e24e812a014d0338c84de3cb2db42d Parents: fd7c10d Author: Dominik PsennerAuthored: Tue Jul 18 18:11:36 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 18:11:36 2017 +0200 -- Jenkinsfile | 38 .../docker/builder-netstandard/Dockerfile | 4 +-- 2 files changed, 25 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 10ce384..e833a45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,20 +27,12 @@ pipeline { agent { label 'ubuntu' } - environment { - JENKINS_UID = "null" - JENKINS_GID = "null" - } stages { // prepare node for builds stage('checkout') { steps { deleteDir() checkout scm - sh ''' - export JENKINS_UID=`stat -c "%u" .` - export JENKINS_GID=`stat -c "%g" .` - ''' } } @@ -53,17 +45,33 @@ pipeline { } } steps { - sh 'echo ${JENKINS_UID}' - sh 'echo ${JENKINS_GID}' + script { + checkout scm + + // calculate args required to build the docker container + def JENKINS_UID = sh ( + script: 'stat -c "%u" .', + returnStdout: true + ).trim() + def JENKINS_GID = sh ( + script: 'stat -c "%g" .', + returnStdout: true + ).trim() + + // build docker container + docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + + // run docker container + // sh "docker run builder-netstandard:latest nant compile-netstandard" + } - checkout scm // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + // sh 'nant compile-netstandard' + // stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - sh 'cd netstandard/log4net.tests && dotnet test' + // sh 'cd netstandard/log4net.tests && dotnet test' } } stage('build net-3.5') { @@ -218,7 +226,7 @@ pipeline { unstash 'mono-2.0-assemblies' unstash 'mono-3.5-assemblies' unstash 'mono-4.0-assemblies' - unstash 'netstandard-assemblies' + // unstash 'netstandard-assemblies' // unstash test results unstash 'net-3.5-testresults' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 2c5f9dc..2dc5f54 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++
[35/50] [abbrv] logging-log4net git commit: builder-netstandard: build docker manually
builder-netstandard: build docker manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/db52f483 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/db52f483 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/db52f483 Branch: refs/heads/feature/RollingFileAppender-NG Commit: db52f48359955f50220f447482582de01e7cbece Parents: e08309e Author: Dominik PsennerAuthored: Tue Jul 18 19:31:10 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 19:31:10 2017 +0200 -- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/db52f483/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index fe262c3..d1bb794 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,9 @@ pipeline { echo "$JENKINS_GID" // build docker container - docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + dir ('buildtools/docker/netstandard/') { + docker.build 'builder-netstandard:latest', "--build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + } // run docker container // sh "docker run builder-netstandard:latest nant compile-netstandard"
[01/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to pass in the uid and gid of jenkins as docker build arg
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 PsennerAuthored: Sun Jul 16 17:45:35 2017 +0200 Committer: Dominik Psenner 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 "d...@logging.apache.org" -# 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
logging-log4net git commit: builder-netstandard: build docker manually
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline e08309ec0 -> db52f4835 builder-netstandard: build docker manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/db52f483 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/db52f483 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/db52f483 Branch: refs/heads/feature/cd-pipeline Commit: db52f48359955f50220f447482582de01e7cbece Parents: e08309e Author: Dominik PsennerAuthored: Tue Jul 18 19:31:10 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 19:31:10 2017 +0200 -- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/db52f483/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index fe262c3..d1bb794 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,9 @@ pipeline { echo "$JENKINS_GID" // build docker container - docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + dir ('buildtools/docker/netstandard/') { + docker.build 'builder-netstandard:latest', "--build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + } // run docker container // sh "docker run builder-netstandard:latest nant compile-netstandard"
logging-log4net git commit: builder-netstandard: attempt to build the docker container manually
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline fd7c10d6a -> b38985eb7 builder-netstandard: attempt to build the docker container manually Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b38985eb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b38985eb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b38985eb Branch: refs/heads/feature/cd-pipeline Commit: b38985eb77e24e812a014d0338c84de3cb2db42d Parents: fd7c10d Author: Dominik PsennerAuthored: Tue Jul 18 18:11:36 2017 +0200 Committer: Dominik Psenner Committed: Tue Jul 18 18:11:36 2017 +0200 -- Jenkinsfile | 38 .../docker/builder-netstandard/Dockerfile | 4 +-- 2 files changed, 25 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 10ce384..e833a45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,20 +27,12 @@ pipeline { agent { label 'ubuntu' } - environment { - JENKINS_UID = "null" - JENKINS_GID = "null" - } stages { // prepare node for builds stage('checkout') { steps { deleteDir() checkout scm - sh ''' - export JENKINS_UID=`stat -c "%u" .` - export JENKINS_GID=`stat -c "%g" .` - ''' } } @@ -53,17 +45,33 @@ pipeline { } } steps { - sh 'echo ${JENKINS_UID}' - sh 'echo ${JENKINS_GID}' + script { + checkout scm + + // calculate args required to build the docker container + def JENKINS_UID = sh ( + script: 'stat -c "%u" .', + returnStdout: true + ).trim() + def JENKINS_GID = sh ( + script: 'stat -c "%g" .', + returnStdout: true + ).trim() + + // build docker container + docker.build 'builder-netstandard:latest', "-f buildtools/docker/builder-netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID" + + // run docker container + // sh "docker run builder-netstandard:latest nant compile-netstandard" + } - checkout scm // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + // sh 'nant compile-netstandard' + // stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - sh 'cd netstandard/log4net.tests && dotnet test' + // sh 'cd netstandard/log4net.tests && dotnet test' } } stage('build net-3.5') { @@ -218,7 +226,7 @@ pipeline { unstash 'mono-2.0-assemblies' unstash 'mono-3.5-assemblies' unstash 'mono-4.0-assemblies' - unstash 'netstandard-assemblies' + // unstash 'netstandard-assemblies' // unstash test results unstash 'net-3.5-testresults' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b38985eb/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index
logging-log4net git commit: builder-netstandard: attempt to pass in the uid and gid of jenkins as docker build arg
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline bfef11f85 -> 720316efb 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/cd-pipeline Commit: 720316efb715e26670ee70e215424536c64d8a95 Parents: bfef11f Author: Dominik PsennerAuthored: Sun Jul 16 17:45:35 2017 +0200 Committer: Dominik Psenner 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 "d...@logging.apache.org" -# 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
[07/11] logging-log4net git commit: builder-netstandard: cd into netstandard
builder-netstandard: cd into netstandard Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4bf614d6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4bf614d6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4bf614d6 Branch: refs/heads/develop Commit: 4bf614d6c86688baad23f8cfd016e1696640f744 Parents: 172a8bf Author: Dominik PsennerAuthored: Sun Jul 9 18:40:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:40:38 2017 +0200 -- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4bf614d6/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 5c9b494..0679a6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,9 +54,7 @@ pipeline { stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - dir('netstandard') { - sh 'dotnet test' - } + sh 'cd netstandard && dotnet test' } } stage('build net-3.5') {
[02/11] logging-log4net git commit: builder-netstandard: attempt to run groupadd and useradd in the stage
builder-netstandard: attempt to run groupadd and useradd in the stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0c823141 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0c823141 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0c823141 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 0c823141199e548a1be57cb0bca195e07afac922 Parents: 1beaeae Author: Dominik PsennerAuthored: Sun Jul 9 18:00:32 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:00:32 2017 +0200 -- Jenkinsfile | 5 + buildtools/docker/builder-netstandard/Dockerfile | 8 2 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index df9c3d5..df47822 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,11 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { + // create a jenkins user for dotnet to consume + sh 'sudo groupadd -r -g `id -g` jenkins-slave' + sh 'sudo useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p jenkins' + + // checkout checkout scm // compile http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e00b1f2..ba0cde9 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -5,12 +5,12 @@ FROM microsoft/dotnet MAINTAINER "d...@logging.apache.org" # install dependencies -RUN apt-get update && apt-get install -y nant git +RUN apt-get update && apt-get install -y nant git sudo # 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 +# allow every user to run groupadd and useradd +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/groupadd" >> /etc/sudoers +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/useradd" >> /etc/sudoers
[08/11] logging-log4net git commit: builder-netstandard: cd into netstandard
builder-netstandard: cd into netstandard Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4bf614d6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4bf614d6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4bf614d6 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 4bf614d6c86688baad23f8cfd016e1696640f744 Parents: 172a8bf Author: Dominik PsennerAuthored: Sun Jul 9 18:40:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:40:38 2017 +0200 -- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4bf614d6/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 5c9b494..0679a6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,9 +54,7 @@ pipeline { stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - dir('netstandard') { - sh 'dotnet test' - } + sh 'cd netstandard && dotnet test' } } stage('build net-3.5') {
[01/11] logging-log4net git commit: builder-netstandard: attempt to run groupadd and useradd in the stage
Repository: logging-log4net Updated Branches: refs/heads/develop 1beaeae04 -> bfef11f85 refs/heads/feature/RollingFileAppender-NG d75498efc -> 405c88edb builder-netstandard: attempt to run groupadd and useradd in the stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0c823141 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0c823141 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0c823141 Branch: refs/heads/develop Commit: 0c823141199e548a1be57cb0bca195e07afac922 Parents: 1beaeae Author: Dominik PsennerAuthored: Sun Jul 9 18:00:32 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:00:32 2017 +0200 -- Jenkinsfile | 5 + buildtools/docker/builder-netstandard/Dockerfile | 8 2 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index df9c3d5..df47822 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,11 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { + // create a jenkins user for dotnet to consume + sh 'sudo groupadd -r -g `id -g` jenkins-slave' + sh 'sudo useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p jenkins' + + // checkout checkout scm // compile http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e00b1f2..ba0cde9 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -5,12 +5,12 @@ FROM microsoft/dotnet MAINTAINER "d...@logging.apache.org" # install dependencies -RUN apt-get update && apt-get install -y nant git +RUN apt-get update && apt-get install -y nant git sudo # 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 +# allow every user to run groupadd and useradd +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/groupadd" >> /etc/sudoers +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/useradd" >> /etc/sudoers
logging-log4net git commit: builder-netstandard: cd into netstandard
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 172a8bf42 -> 4bf614d6c builder-netstandard: cd into netstandard Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4bf614d6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4bf614d6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4bf614d6 Branch: refs/heads/feature/cd-pipeline Commit: 4bf614d6c86688baad23f8cfd016e1696640f744 Parents: 172a8bf Author: Dominik PsennerAuthored: Sun Jul 9 18:40:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:40:38 2017 +0200 -- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4bf614d6/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 5c9b494..0679a6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,9 +54,7 @@ pipeline { stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' // test - dir('netstandard') { - sh 'dotnet test' - } + sh 'cd netstandard && dotnet test' } } stage('build net-3.5') {
logging-log4net git commit: builder-netstandard: attempt to run groupadd and useradd in the stage
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 1beaeae04 -> 0c8231411 builder-netstandard: attempt to run groupadd and useradd in the stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0c823141 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0c823141 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0c823141 Branch: refs/heads/feature/cd-pipeline Commit: 0c823141199e548a1be57cb0bca195e07afac922 Parents: 1beaeae Author: Dominik PsennerAuthored: Sun Jul 9 18:00:32 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 18:00:32 2017 +0200 -- Jenkinsfile | 5 + buildtools/docker/builder-netstandard/Dockerfile | 8 2 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index df9c3d5..df47822 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,11 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { + // create a jenkins user for dotnet to consume + sh 'sudo groupadd -r -g `id -g` jenkins-slave' + sh 'sudo useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p jenkins' + + // checkout checkout scm // compile http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0c823141/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e00b1f2..ba0cde9 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -5,12 +5,12 @@ FROM microsoft/dotnet MAINTAINER "d...@logging.apache.org" # install dependencies -RUN apt-get update && apt-get install -y nant git +RUN apt-get update && apt-get install -y nant git sudo # 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 +# allow every user to run groupadd and useradd +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/groupadd" >> /etc/sudoers +RUN echo "ALL ALL=NOPASSWD: /usr/sbin/useradd" >> /etc/sudoers
[36/50] [abbrv] logging-log4net git commit: builder-netstandard: yet another try
builder-netstandard: yet another try Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/34729e30 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/34729e30 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/34729e30 Branch: refs/heads/develop Commit: 34729e30a33e9b809321f6c551a905f8fc1d32c4 Parents: ceb5d4a Author: Dominik PsennerAuthored: Sun Jul 9 16:57:54 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:57:54 2017 +0200 -- Jenkinsfile | 4 buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 2 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8eff08f..9fb6a70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,11 @@ pipeline { dir 'buildtools/docker/builder-netstandard' } } + environment { + WORKSPACE = '/var/workspaces/jenkins' + } steps { + sh 'cd $WORKSPACE' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 8dc6710..97c20a6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -7,7 +7,10 @@ MAINTAINER "d...@logging.apache.org" # install dependencies RUN apt-get update && apt-get install -y nant git -# add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts +# 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 --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +-RUN useradd --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[30/50] [abbrv] logging-log4net git commit: builder-netstandard: moved customWorkspace to the node around stage
builder-netstandard: moved customWorkspace to the node around stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6045e5e8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6045e5e8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6045e5e8 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 6045e5e866332c65712d70316598d4c2af5b1c72 Parents: 01b7062 Author: Dominik PsennerAuthored: Sun Jul 9 16:00:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:00:38 2017 +0200 -- Jenkinsfile | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6045e5e8/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3ee956c..dc19dbf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,20 +45,22 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins/workspace' } } - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + node { + customWorkspace '/home/jenkins/workspace' + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + } } } stage('build net-3.5') {
[43/50] [abbrv] logging-log4net git commit: builder-netstandard: adduser -> useradd
builder-netstandard: adduser -> useradd Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/317b1ce5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/317b1ce5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/317b1ce5 Branch: refs/heads/develop Commit: 317b1ce5b35485efdd9f047cced38b50d0044adb Parents: 5b96f46 Author: Dominik PsennerAuthored: Sun Jul 9 17:07:08 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:07:08 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/317b1ce5/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 91e7f8a..e00b1f2 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[24/50] [abbrv] logging-log4net git commit: builder-netstandard: added node section to allow customWorkspace
builder-netstandard: added node section to allow customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4934c1a9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4934c1a9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4934c1a9 Branch: refs/heads/develop Commit: 4934c1a9abe7a0f7dc7f76115a5e212b7591fca8 Parents: 78f3133 Author: Dominik PsennerAuthored: Sun Jul 9 14:45:52 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:45:52 2017 +0200 -- Jenkinsfile | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4934c1a9/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 436a897..464e0c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,11 +38,13 @@ pipeline { // builds stage('build netstandard') { agent { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + node { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } + customWorkspace '/home/jenkins' } - customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
[02/50] [abbrv] logging-log4net git commit: builder-netstandard: try to update $HOME of jenkins when docker starts up
builder-netstandard: try to update $HOME of jenkins when docker starts up Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/db04e9e2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/db04e9e2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/db04e9e2 Branch: refs/heads/develop Commit: db04e9e22d880d5e8859c37c40c81379d60c67bd Parents: e92379f Author: Dominik PsennerAuthored: Sat Jul 8 22:58:20 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 22:58:20 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/db04e9e2/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 169b328..3f44ea6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -10,3 +10,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins + +# include entrypoint to update the home directory of jenkins when docker starts +COPY entrypoint.sh /usr/local/bin/entrypoint.sh +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
[39/50] [abbrv] logging-log4net git commit: builder-netstandard: create home for user jenkins
builder-netstandard: create home for user jenkins Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0eb85795 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0eb85795 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0eb85795 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 0eb857952f28b95b9ce2be5505210a18b37d6a8e Parents: 34729e3 Author: Dominik PsennerAuthored: Sun Jul 9 17:01:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:01:38 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0eb85795/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 97c20a6..91e7f8a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[15/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to change the user home directory in the entrypoint.sh
builder-netstandard: attempt to change the user home directory in the entrypoint.sh Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/66d05d5c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/66d05d5c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/66d05d5c Branch: refs/heads/develop Commit: 66d05d5c37739ef6e92eb9b0fefdecb1733ead77 Parents: 6962bf5 Author: Dominik PsennerAuthored: Sun Jul 9 11:55:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 11:55:35 2017 +0200 -- Jenkinsfile | 1 - buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 291ee02..62f6b2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -165,7 +165,6 @@ pipeline { } } steps { - sh 'usermod -m -d `pwd` jenkins' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e68844e..e87218e 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d $HOME jenkins +usermod -m -d `pwd` jenkins
[31/50] [abbrv] logging-log4net git commit: builder-netstandard: moved customWorkspace to the node around stage
builder-netstandard: moved customWorkspace to the node around stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6045e5e8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6045e5e8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6045e5e8 Branch: refs/heads/develop Commit: 6045e5e866332c65712d70316598d4c2af5b1c72 Parents: 01b7062 Author: Dominik PsennerAuthored: Sun Jul 9 16:00:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:00:38 2017 +0200 -- Jenkinsfile | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6045e5e8/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3ee956c..dc19dbf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,20 +45,22 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins/workspace' } } - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + node { + customWorkspace '/home/jenkins/workspace' + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + } } } stage('build net-3.5') {
[22/50] [abbrv] logging-log4net git commit: builder-netstandard: put customworkspace in agent section
builder-netstandard: put customworkspace in agent section Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/78f31337 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/78f31337 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/78f31337 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 78f31337c5c8b4f413c7f9867dad49f9262a4247 Parents: 5345774 Author: Dominik PsennerAuthored: Sun Jul 9 14:38:07 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:38:07 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/78f31337/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3b77122..436a897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,8 +41,8 @@ pipeline { dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true - customWorkspace '/home/jenkins' } + customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
[27/50] [abbrv] logging-log4net git commit: builder-netstandard: added label node to node
builder-netstandard: added label node to node Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/785778ad Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/785778ad Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/785778ad Branch: refs/heads/feature/RollingFileAppender-NG Commit: 785778ad911103b10a1fe5245a37c5f018025d82 Parents: 4934c1a Author: Dominik PsennerAuthored: Sun Jul 9 15:49:39 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:49:39 2017 +0200 -- Jenkinsfile | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/785778ad/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 464e0c6..2879b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,9 +39,11 @@ pipeline { stage('build netstandard') { agent { node { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + label { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } } customWorkspace '/home/jenkins' }
[20/50] [abbrv] logging-log4net git commit: builder-netstandard: put customWorkspace inside dockerfile
builder-netstandard: put customWorkspace inside dockerfile Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/53457747 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/53457747 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/53457747 Branch: refs/heads/develop Commit: 5345774773b5b217b388a239ac656a8cdcd741a8 Parents: f030e34 Author: Dominik PsennerAuthored: Sun Jul 9 13:14:46 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:14:46 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/53457747/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8c5a131..3b77122 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,10 +38,10 @@ pipeline { // builds stage('build netstandard') { agent { - customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true + customWorkspace '/home/jenkins' } } steps {
[08/50] [abbrv] logging-log4net git commit: builder-netstandard: added entrypoint.sh script
builder-netstandard: added entrypoint.sh script Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd2cba97 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd2cba97 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd2cba97 Branch: refs/heads/feature/RollingFileAppender-NG Commit: dd2cba97bfd46f6df58cbc1e265756de5a394f8c Parents: 78d23bb Author: Dominik PsennerAuthored: Sun Jul 9 09:00:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:00:35 2017 +0200 -- buildtools/docker/builder-netstandard/entrypoint.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd2cba97/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh new file mode 100755 index 000..e68844e --- /dev/null +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +usermod -m -d $HOME jenkins +
[09/50] [abbrv] logging-log4net git commit: builder-netstandard: added entrypoint.sh script
builder-netstandard: added entrypoint.sh script Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd2cba97 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd2cba97 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd2cba97 Branch: refs/heads/develop Commit: dd2cba97bfd46f6df58cbc1e265756de5a394f8c Parents: 78d23bb Author: Dominik PsennerAuthored: Sun Jul 9 09:00:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:00:35 2017 +0200 -- buildtools/docker/builder-netstandard/entrypoint.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd2cba97/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh new file mode 100755 index 000..e68844e --- /dev/null +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +usermod -m -d $HOME jenkins +
[45/50] [abbrv] logging-log4net git commit: builder-netstandard: it builds!
builder-netstandard: it builds! Clean up jenkinsfile.. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f657526c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f657526c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f657526c Branch: refs/heads/develop Commit: f657526cdd72dd22e1a44e70bf3ff67c6a0850b2 Parents: 317b1ce Author: Dominik PsennerAuthored: Sun Jul 9 17:15:51 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:15:51 2017 +0200 -- Jenkinsfile | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f657526c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 51324b2..df9c3d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,12 +47,6 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { - sh 'cd $WORKSPACE' - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - checkout scm // compile
[25/50] [abbrv] logging-log4net git commit: builder-netstandard: added node section to allow customWorkspace
builder-netstandard: added node section to allow customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4934c1a9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4934c1a9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4934c1a9 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 4934c1a9abe7a0f7dc7f76115a5e212b7591fca8 Parents: 78f3133 Author: Dominik PsennerAuthored: Sun Jul 9 14:45:52 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:45:52 2017 +0200 -- Jenkinsfile | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4934c1a9/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 436a897..464e0c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,11 +38,13 @@ pipeline { // builds stage('build netstandard') { agent { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + node { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } + customWorkspace '/home/jenkins' } - customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
[38/50] [abbrv] logging-log4net git commit: builder-netstandard: create home for user jenkins
builder-netstandard: create home for user jenkins Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0eb85795 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0eb85795 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0eb85795 Branch: refs/heads/develop Commit: 0eb857952f28b95b9ce2be5505210a18b37d6a8e Parents: 34729e3 Author: Dominik PsennerAuthored: Sun Jul 9 17:01:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:01:38 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0eb85795/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 97c20a6..91e7f8a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[34/50] [abbrv] logging-log4net git commit: builder-netstandard: attempting to set a completely custom workspace
builder-netstandard: attempting to set a completely custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ceb5d4ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ceb5d4ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ceb5d4ae Branch: refs/heads/feature/RollingFileAppender-NG Commit: ceb5d4ae3aee2b9d77f757528909f1d199c9e676 Parents: 71bd56b Author: Dominik PsennerAuthored: Sun Jul 9 16:38:55 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:38:55 2017 +0200 -- Jenkinsfile | 9 ++--- buildtools/docker/builder-netstandard/Dockerfile| 5 + buildtools/docker/builder-netstandard/entrypoint.sh | 4 3 files changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index bd07758..8eff08f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,13 +38,8 @@ pipeline { // builds stage('build netstandard') { agent { - node { - label { - dockerfile { - dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' - } - } - customWorkspace '/home/jenkins/workspace' + dockerfile { + dir 'buildtools/docker/builder-netstandard' } } steps { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..8dc6710 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,8 +9,5 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins -# include entrypoint to update the home directory of jenkins when docker starts -COPY entrypoint.sh /usr/local/bin/entrypoint.sh -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh deleted file mode 100755 index 06f4025..000 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -#usermod -m -d `pwd` jenkins -
[40/50] [abbrv] logging-log4net git commit: builder-netstandard: reuseNode must be set
builder-netstandard: reuseNode must be set Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5b96f46c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5b96f46c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5b96f46c Branch: refs/heads/develop Commit: 5b96f46c9ef44634fd0ec0f968d61c5a159fdc87 Parents: 0eb8579 Author: Dominik PsennerAuthored: Sun Jul 9 17:04:53 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:04:53 2017 +0200 -- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5b96f46c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 9fb6a70..51324b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { agent { dockerfile { dir 'buildtools/docker/builder-netstandard' + reuseNode true } } environment {
[10/50] [abbrv] logging-log4net git commit: builder-netstandard: set home directory to something deeper in the folder structure
builder-netstandard: set home directory to something deeper in the folder structure Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/df782e3d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/df782e3d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/df782e3d Branch: refs/heads/feature/RollingFileAppender-NG Commit: df782e3d68d6557926f12656d8560fb6fca3f3b6 Parents: dd2cba9 Author: Dominik PsennerAuthored: Sun Jul 9 09:12:20 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:12:20 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df782e3d/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..e553e85 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh
[14/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to change the user home directory in the entrypoint.sh
builder-netstandard: attempt to change the user home directory in the entrypoint.sh Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/66d05d5c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/66d05d5c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/66d05d5c Branch: refs/heads/feature/RollingFileAppender-NG Commit: 66d05d5c37739ef6e92eb9b0fefdecb1733ead77 Parents: 6962bf5 Author: Dominik PsennerAuthored: Sun Jul 9 11:55:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 11:55:35 2017 +0200 -- Jenkinsfile | 1 - buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 291ee02..62f6b2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -165,7 +165,6 @@ pipeline { } } steps { - sh 'usermod -m -d `pwd` jenkins' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e68844e..e87218e 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d $HOME jenkins +usermod -m -d `pwd` jenkins
[21/50] [abbrv] logging-log4net git commit: builder-netstandard: put customWorkspace inside dockerfile
builder-netstandard: put customWorkspace inside dockerfile Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/53457747 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/53457747 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/53457747 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 5345774773b5b217b388a239ac656a8cdcd741a8 Parents: f030e34 Author: Dominik PsennerAuthored: Sun Jul 9 13:14:46 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:14:46 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/53457747/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8c5a131..3b77122 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,10 +38,10 @@ pipeline { // builds stage('build netstandard') { agent { - customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true + customWorkspace '/home/jenkins' } } steps {
[23/50] [abbrv] logging-log4net git commit: builder-netstandard: put customworkspace in agent section
builder-netstandard: put customworkspace in agent section Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/78f31337 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/78f31337 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/78f31337 Branch: refs/heads/develop Commit: 78f31337c5c8b4f413c7f9867dad49f9262a4247 Parents: 5345774 Author: Dominik PsennerAuthored: Sun Jul 9 14:38:07 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:38:07 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/78f31337/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3b77122..436a897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,8 +41,8 @@ pipeline { dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true - customWorkspace '/home/jenkins' } + customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
[26/50] [abbrv] logging-log4net git commit: builder-netstandard: added label node to node
builder-netstandard: added label node to node Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/785778ad Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/785778ad Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/785778ad Branch: refs/heads/develop Commit: 785778ad911103b10a1fe5245a37c5f018025d82 Parents: 4934c1a Author: Dominik PsennerAuthored: Sun Jul 9 15:49:39 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:49:39 2017 +0200 -- Jenkinsfile | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/785778ad/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 464e0c6..2879b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,9 +39,11 @@ pipeline { stage('build netstandard') { agent { node { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + label { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } } customWorkspace '/home/jenkins' }
[28/50] [abbrv] logging-log4net git commit: builder-netstandard: added workspace to custom workspace
builder-netstandard: added workspace to custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/01b7062f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/01b7062f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/01b7062f Branch: refs/heads/develop Commit: 01b7062f631ced29d583eb5f525d39cf870f0cf8 Parents: 785778a Author: Dominik PsennerAuthored: Sun Jul 9 15:56:56 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:56:56 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/01b7062f/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 2879b97..3ee956c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins' + customWorkspace '/home/jenkins/workspace' } } steps {
[35/50] [abbrv] logging-log4net git commit: builder-netstandard: attempting to set a completely custom workspace
builder-netstandard: attempting to set a completely custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ceb5d4ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ceb5d4ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ceb5d4ae Branch: refs/heads/develop Commit: ceb5d4ae3aee2b9d77f757528909f1d199c9e676 Parents: 71bd56b Author: Dominik PsennerAuthored: Sun Jul 9 16:38:55 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:38:55 2017 +0200 -- Jenkinsfile | 9 ++--- buildtools/docker/builder-netstandard/Dockerfile| 5 + buildtools/docker/builder-netstandard/entrypoint.sh | 4 3 files changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index bd07758..8eff08f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,13 +38,8 @@ pipeline { // builds stage('build netstandard') { agent { - node { - label { - dockerfile { - dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' - } - } - customWorkspace '/home/jenkins/workspace' + dockerfile { + dir 'buildtools/docker/builder-netstandard' } } steps { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..8dc6710 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,8 +9,5 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins -# include entrypoint to update the home directory of jenkins when docker starts -COPY entrypoint.sh /usr/local/bin/entrypoint.sh -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh deleted file mode 100755 index 06f4025..000 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -#usermod -m -d `pwd` jenkins -
[46/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to run the tests
builder-netstandard: attempt to run the tests Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4afbd6b4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4afbd6b4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4afbd6b4 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 4afbd6b4193194648b8ab73f6863fc8034a3e6bb Parents: f657526 Author: Dominik PsennerAuthored: Sun Jul 9 17:19:47 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:19:47 2017 +0200 -- Jenkinsfile | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4afbd6b4/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index df9c3d5..7f71ed7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,11 @@ pipeline { // compile sh 'nant compile-netstandard' stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + + // test + dir('netstandard') { + sh 'dotnet test log4net.tests' + } } } stage('build net-3.5') {
[44/50] [abbrv] logging-log4net git commit: builder-netstandard: it builds!
builder-netstandard: it builds! Clean up jenkinsfile.. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f657526c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f657526c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f657526c Branch: refs/heads/feature/RollingFileAppender-NG Commit: f657526cdd72dd22e1a44e70bf3ff67c6a0850b2 Parents: 317b1ce Author: Dominik PsennerAuthored: Sun Jul 9 17:15:51 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:15:51 2017 +0200 -- Jenkinsfile | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f657526c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 51324b2..df9c3d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,12 +47,6 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { - sh 'cd $WORKSPACE' - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - checkout scm // compile
[42/50] [abbrv] logging-log4net git commit: builder-netstandard: adduser -> useradd
builder-netstandard: adduser -> useradd Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/317b1ce5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/317b1ce5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/317b1ce5 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 317b1ce5b35485efdd9f047cced38b50d0044adb Parents: 5b96f46 Author: Dominik PsennerAuthored: Sun Jul 9 17:07:08 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:07:08 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/317b1ce5/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 91e7f8a..e00b1f2 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[37/50] [abbrv] logging-log4net git commit: builder-netstandard: yet another try
builder-netstandard: yet another try Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/34729e30 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/34729e30 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/34729e30 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 34729e30a33e9b809321f6c551a905f8fc1d32c4 Parents: ceb5d4a Author: Dominik PsennerAuthored: Sun Jul 9 16:57:54 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:57:54 2017 +0200 -- Jenkinsfile | 4 buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 2 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8eff08f..9fb6a70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,11 @@ pipeline { dir 'buildtools/docker/builder-netstandard' } } + environment { + WORKSPACE = '/var/workspaces/jenkins' + } steps { + sh 'cd $WORKSPACE' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 8dc6710..97c20a6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -7,7 +7,10 @@ MAINTAINER "d...@logging.apache.org" # install dependencies RUN apt-get update && apt-get install -y nant git -# add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts +# 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 --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +-RUN useradd --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
[11/50] [abbrv] logging-log4net git commit: builder-netstandard: set home directory to something deeper in the folder structure
builder-netstandard: set home directory to something deeper in the folder structure Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/df782e3d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/df782e3d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/df782e3d Branch: refs/heads/develop Commit: df782e3d68d6557926f12656d8560fb6fca3f3b6 Parents: dd2cba9 Author: Dominik PsennerAuthored: Sun Jul 9 09:12:20 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:12:20 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df782e3d/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..e553e85 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh
[32/50] [abbrv] logging-log4net git commit: builder-netstandard: ...
builder-netstandard: ... Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/71bd56ba Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/71bd56ba Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/71bd56ba Branch: refs/heads/develop Commit: 71bd56ba3fc6c73054cc0e31d62070a5805b8e1a Parents: 6045e5e Author: Dominik PsennerAuthored: Sun Jul 9 16:07:17 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:07:17 2017 +0200 -- Jenkinsfile | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/71bd56ba/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index dc19dbf..bd07758 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,26 +41,23 @@ pipeline { node { label { dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' } } + customWorkspace '/home/jenkins/workspace' } } - node { - customWorkspace '/home/jenkins/workspace' - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' - } + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' } } stage('build net-3.5') {
[03/50] [abbrv] logging-log4net git commit: builder-netstandard: try to update $HOME of jenkins when docker starts up
builder-netstandard: try to update $HOME of jenkins when docker starts up Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/db04e9e2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/db04e9e2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/db04e9e2 Branch: refs/heads/feature/RollingFileAppender-NG Commit: db04e9e22d880d5e8859c37c40c81379d60c67bd Parents: e92379f Author: Dominik PsennerAuthored: Sat Jul 8 22:58:20 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 22:58:20 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/db04e9e2/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 169b328..3f44ea6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -10,3 +10,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins + +# include entrypoint to update the home directory of jenkins when docker starts +COPY entrypoint.sh /usr/local/bin/entrypoint.sh +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
[33/50] [abbrv] logging-log4net git commit: builder-netstandard: ...
builder-netstandard: ... Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/71bd56ba Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/71bd56ba Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/71bd56ba Branch: refs/heads/feature/RollingFileAppender-NG Commit: 71bd56ba3fc6c73054cc0e31d62070a5805b8e1a Parents: 6045e5e Author: Dominik PsennerAuthored: Sun Jul 9 16:07:17 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:07:17 2017 +0200 -- Jenkinsfile | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/71bd56ba/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index dc19dbf..bd07758 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,26 +41,23 @@ pipeline { node { label { dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' } } + customWorkspace '/home/jenkins/workspace' } } - node { - customWorkspace '/home/jenkins/workspace' - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' - } + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' } } stage('build net-3.5') {
[18/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to use customWorkspace
builder-netstandard: attempt to use customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f030e347 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f030e347 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f030e347 Branch: refs/heads/develop Commit: f030e347d68345a8cbce346ba6e14b9bd4ad4a9c Parents: 14675ee Author: Dominik PsennerAuthored: Sun Jul 9 13:11:11 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:11:11 2017 +0200 -- Jenkinsfile | 1 + buildtools/docker/builder-netstandard/Dockerfile| 2 +- buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index cbb3a9d..8c5a131 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { // builds stage('build netstandard') { agent { + customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e553e85..3f44ea6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e87218e..06f4025 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d `pwd` jenkins +#usermod -m -d `pwd` jenkins
[29/50] [abbrv] logging-log4net git commit: builder-netstandard: added workspace to custom workspace
builder-netstandard: added workspace to custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/01b7062f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/01b7062f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/01b7062f Branch: refs/heads/feature/RollingFileAppender-NG Commit: 01b7062f631ced29d583eb5f525d39cf870f0cf8 Parents: 785778a Author: Dominik PsennerAuthored: Sun Jul 9 15:56:56 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:56:56 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/01b7062f/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 2879b97..3ee956c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins' + customWorkspace '/home/jenkins/workspace' } } steps {
[19/50] [abbrv] logging-log4net git commit: builder-netstandard: attempt to use customWorkspace
builder-netstandard: attempt to use customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f030e347 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f030e347 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f030e347 Branch: refs/heads/feature/RollingFileAppender-NG Commit: f030e347d68345a8cbce346ba6e14b9bd4ad4a9c Parents: 14675ee Author: Dominik PsennerAuthored: Sun Jul 9 13:11:11 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:11:11 2017 +0200 -- Jenkinsfile | 1 + buildtools/docker/builder-netstandard/Dockerfile| 2 +- buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index cbb3a9d..8c5a131 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { // builds stage('build netstandard') { agent { + customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e553e85..3f44ea6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e87218e..06f4025 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d `pwd` jenkins +#usermod -m -d `pwd` jenkins
logging-log4net git commit: builder-netstandard: attempt to run the tests
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline f657526cd -> 4afbd6b41 builder-netstandard: attempt to run the tests Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4afbd6b4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4afbd6b4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4afbd6b4 Branch: refs/heads/feature/cd-pipeline Commit: 4afbd6b4193194648b8ab73f6863fc8034a3e6bb Parents: f657526 Author: Dominik PsennerAuthored: Sun Jul 9 17:19:47 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:19:47 2017 +0200 -- Jenkinsfile | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4afbd6b4/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index df9c3d5..7f71ed7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,11 @@ pipeline { // compile sh 'nant compile-netstandard' stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + + // test + dir('netstandard') { + sh 'dotnet test log4net.tests' + } } } stage('build net-3.5') {
logging-log4net git commit: builder-netstandard: it builds!
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 317b1ce5b -> f657526cd builder-netstandard: it builds! Clean up jenkinsfile.. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f657526c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f657526c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f657526c Branch: refs/heads/feature/cd-pipeline Commit: f657526cdd72dd22e1a44e70bf3ff67c6a0850b2 Parents: 317b1ce Author: Dominik PsennerAuthored: Sun Jul 9 17:15:51 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:15:51 2017 +0200 -- Jenkinsfile | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f657526c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 51324b2..df9c3d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,12 +47,6 @@ pipeline { WORKSPACE = '/var/workspaces/jenkins' } steps { - sh 'cd $WORKSPACE' - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - checkout scm // compile
logging-log4net git commit: builder-netstandard: adduser -> useradd
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 5b96f46c9 -> 317b1ce5b builder-netstandard: adduser -> useradd Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/317b1ce5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/317b1ce5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/317b1ce5 Branch: refs/heads/feature/cd-pipeline Commit: 317b1ce5b35485efdd9f047cced38b50d0044adb Parents: 5b96f46 Author: Dominik PsennerAuthored: Sun Jul 9 17:07:08 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:07:08 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/317b1ce5/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 91e7f8a..e00b1f2 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
logging-log4net git commit: builder-netstandard: reuseNode must be set
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 0eb857952 -> 5b96f46c9 builder-netstandard: reuseNode must be set Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5b96f46c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5b96f46c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5b96f46c Branch: refs/heads/feature/cd-pipeline Commit: 5b96f46c9ef44634fd0ec0f968d61c5a159fdc87 Parents: 0eb8579 Author: Dominik PsennerAuthored: Sun Jul 9 17:04:53 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:04:53 2017 +0200 -- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5b96f46c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 9fb6a70..51324b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { agent { dockerfile { dir 'buildtools/docker/builder-netstandard' + reuseNode true } } environment {
logging-log4net git commit: builder-netstandard: create home for user jenkins
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 34729e30a -> 0eb857952 builder-netstandard: create home for user jenkins Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0eb85795 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0eb85795 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0eb85795 Branch: refs/heads/feature/cd-pipeline Commit: 0eb857952f28b95b9ce2be5505210a18b37d6a8e Parents: 34729e3 Author: Dominik PsennerAuthored: Sun Jul 9 17:01:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 17:01:38 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0eb85795/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 97c20a6..91e7f8a 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -12,5 +12,5 @@ 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 --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN adduser --base-dir /var/workspaces --create-home --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
logging-log4net git commit: builder-netstandard: yet another try
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline ceb5d4ae3 -> 34729e30a builder-netstandard: yet another try Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/34729e30 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/34729e30 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/34729e30 Branch: refs/heads/feature/cd-pipeline Commit: 34729e30a33e9b809321f6c551a905f8fc1d32c4 Parents: ceb5d4a Author: Dominik PsennerAuthored: Sun Jul 9 16:57:54 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:57:54 2017 +0200 -- Jenkinsfile | 4 buildtools/docker/builder-netstandard/Dockerfile | 7 +-- 2 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8eff08f..9fb6a70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,11 @@ pipeline { dir 'buildtools/docker/builder-netstandard' } } + environment { + WORKSPACE = '/var/workspaces/jenkins' + } steps { + sh 'cd $WORKSPACE' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/34729e30/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 8dc6710..97c20a6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -7,7 +7,10 @@ MAINTAINER "d...@logging.apache.org" # install dependencies RUN apt-get update && apt-get install -y nant git -# add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts +# 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 --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +-RUN useradd --home-dir /var/workspaces/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins
logging-log4net git commit: builder-netstandard: attempting to set a completely custom workspace
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 71bd56ba3 -> ceb5d4ae3 builder-netstandard: attempting to set a completely custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ceb5d4ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ceb5d4ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ceb5d4ae Branch: refs/heads/feature/cd-pipeline Commit: ceb5d4ae3aee2b9d77f757528909f1d199c9e676 Parents: 71bd56b Author: Dominik PsennerAuthored: Sun Jul 9 16:38:55 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:38:55 2017 +0200 -- Jenkinsfile | 9 ++--- buildtools/docker/builder-netstandard/Dockerfile| 5 + buildtools/docker/builder-netstandard/entrypoint.sh | 4 3 files changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index bd07758..8eff08f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,13 +38,8 @@ pipeline { // builds stage('build netstandard') { agent { - node { - label { - dockerfile { - dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' - } - } - customWorkspace '/home/jenkins/workspace' + dockerfile { + dir 'buildtools/docker/builder-netstandard' } } steps { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..8dc6710 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,8 +9,5 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins-10025 --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins -# include entrypoint to update the home directory of jenkins when docker starts -COPY entrypoint.sh /usr/local/bin/entrypoint.sh -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ceb5d4ae/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh deleted file mode 100755 index 06f4025..000 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -#usermod -m -d `pwd` jenkins -
logging-log4net git commit: builder-netstandard: ...
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 6045e5e86 -> 71bd56ba3 builder-netstandard: ... Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/71bd56ba Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/71bd56ba Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/71bd56ba Branch: refs/heads/feature/cd-pipeline Commit: 71bd56ba3fc6c73054cc0e31d62070a5805b8e1a Parents: 6045e5e Author: Dominik PsennerAuthored: Sun Jul 9 16:07:17 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:07:17 2017 +0200 -- Jenkinsfile | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/71bd56ba/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index dc19dbf..bd07758 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,26 +41,23 @@ pipeline { node { label { dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + dir '/home/jenkins/workspace/buildtools/docker/builder-netstandard' } } + customWorkspace '/home/jenkins/workspace' } } - node { - customWorkspace '/home/jenkins/workspace' - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' - } + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' } } stage('build net-3.5') {
logging-log4net git commit: builder-netstandard: moved customWorkspace to the node around stage
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 01b7062f6 -> 6045e5e86 builder-netstandard: moved customWorkspace to the node around stage Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6045e5e8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6045e5e8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6045e5e8 Branch: refs/heads/feature/cd-pipeline Commit: 6045e5e866332c65712d70316598d4c2af5b1c72 Parents: 01b7062 Author: Dominik PsennerAuthored: Sun Jul 9 16:00:38 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 16:00:38 2017 +0200 -- Jenkinsfile | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6045e5e8/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3ee956c..dc19dbf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,20 +45,22 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins/workspace' } } - steps { - sh 'export HOME=`pwd`' - sh 'echo home=$HOME' - sh 'echo user=$USER' - sh 'cat /etc/passwd' - - checkout scm - - // compile - sh 'nant compile-netstandard' - stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + node { + customWorkspace '/home/jenkins/workspace' + steps { + sh 'export HOME=`pwd`' + sh 'echo home=$HOME' + sh 'echo user=$USER' + sh 'cat /etc/passwd' + + checkout scm + + // compile + sh 'nant compile-netstandard' + stash includes: 'bin/**/*.*', name: 'netstandard-assemblies' + } } } stage('build net-3.5') {
logging-log4net git commit: builder-netstandard: added workspace to custom workspace
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 785778ad9 -> 01b7062f6 builder-netstandard: added workspace to custom workspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/01b7062f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/01b7062f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/01b7062f Branch: refs/heads/feature/cd-pipeline Commit: 01b7062f631ced29d583eb5f525d39cf870f0cf8 Parents: 785778a Author: Dominik PsennerAuthored: Sun Jul 9 15:56:56 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:56:56 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/01b7062f/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 2879b97..3ee956c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { reuseNode true } } - customWorkspace '/home/jenkins' + customWorkspace '/home/jenkins/workspace' } } steps {
logging-log4net git commit: builder-netstandard: added label node to node
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 4934c1a9a -> 785778ad9 builder-netstandard: added label node to node Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/785778ad Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/785778ad Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/785778ad Branch: refs/heads/feature/cd-pipeline Commit: 785778ad911103b10a1fe5245a37c5f018025d82 Parents: 4934c1a Author: Dominik PsennerAuthored: Sun Jul 9 15:49:39 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 15:49:39 2017 +0200 -- Jenkinsfile | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/785778ad/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 464e0c6..2879b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,9 +39,11 @@ pipeline { stage('build netstandard') { agent { node { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + label { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } } customWorkspace '/home/jenkins' }
logging-log4net git commit: builder-netstandard: added node section to allow customWorkspace
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 78f31337c -> 4934c1a9a builder-netstandard: added node section to allow customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4934c1a9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4934c1a9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4934c1a9 Branch: refs/heads/feature/cd-pipeline Commit: 4934c1a9abe7a0f7dc7f76115a5e212b7591fca8 Parents: 78f3133 Author: Dominik PsennerAuthored: Sun Jul 9 14:45:52 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:45:52 2017 +0200 -- Jenkinsfile | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4934c1a9/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 436a897..464e0c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,11 +38,13 @@ pipeline { // builds stage('build netstandard') { agent { - dockerfile { - dir 'buildtools/docker/builder-netstandard' - reuseNode true + node { + dockerfile { + dir 'buildtools/docker/builder-netstandard' + reuseNode true + } + customWorkspace '/home/jenkins' } - customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
logging-log4net git commit: builder-netstandard: put customworkspace in agent section
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 534577477 -> 78f31337c builder-netstandard: put customworkspace in agent section Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/78f31337 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/78f31337 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/78f31337 Branch: refs/heads/feature/cd-pipeline Commit: 78f31337c5c8b4f413c7f9867dad49f9262a4247 Parents: 5345774 Author: Dominik PsennerAuthored: Sun Jul 9 14:38:07 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 14:38:07 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/78f31337/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 3b77122..436a897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,8 +41,8 @@ pipeline { dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true - customWorkspace '/home/jenkins' } + customWorkspace '/home/jenkins' } steps { sh 'export HOME=`pwd`'
logging-log4net git commit: builder-netstandard: put customWorkspace inside dockerfile
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline f030e347d -> 534577477 builder-netstandard: put customWorkspace inside dockerfile Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/53457747 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/53457747 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/53457747 Branch: refs/heads/feature/cd-pipeline Commit: 5345774773b5b217b388a239ac656a8cdcd741a8 Parents: f030e34 Author: Dominik PsennerAuthored: Sun Jul 9 13:14:46 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:14:46 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/53457747/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8c5a131..3b77122 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,10 +38,10 @@ pipeline { // builds stage('build netstandard') { agent { - customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true + customWorkspace '/home/jenkins' } } steps {
logging-log4net git commit: builder-netstandard: attempt to use customWorkspace
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 14675ee96 -> f030e347d builder-netstandard: attempt to use customWorkspace Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f030e347 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f030e347 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f030e347 Branch: refs/heads/feature/cd-pipeline Commit: f030e347d68345a8cbce346ba6e14b9bd4ad4a9c Parents: 14675ee Author: Dominik PsennerAuthored: Sun Jul 9 13:11:11 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 13:11:11 2017 +0200 -- Jenkinsfile | 1 + buildtools/docker/builder-netstandard/Dockerfile| 2 +- buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index cbb3a9d..8c5a131 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { // builds stage('build netstandard') { agent { + customWorkspace '/home/jenkins' dockerfile { dir 'buildtools/docker/builder-netstandard' reuseNode true http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index e553e85..3f44ea6 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f030e347/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e87218e..06f4025 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d `pwd` jenkins +#usermod -m -d `pwd` jenkins
logging-log4net git commit: builder-netstandard: attempt to change the user home directory in the entrypoint.sh
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 6962bf5d1 -> 66d05d5c3 builder-netstandard: attempt to change the user home directory in the entrypoint.sh Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/66d05d5c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/66d05d5c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/66d05d5c Branch: refs/heads/feature/cd-pipeline Commit: 66d05d5c37739ef6e92eb9b0fefdecb1733ead77 Parents: 6962bf5 Author: Dominik PsennerAuthored: Sun Jul 9 11:55:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 11:55:35 2017 +0200 -- Jenkinsfile | 1 - buildtools/docker/builder-netstandard/entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 291ee02..62f6b2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -165,7 +165,6 @@ pipeline { } } steps { - sh 'usermod -m -d `pwd` jenkins' sh 'export HOME=`pwd`' sh 'echo home=$HOME' sh 'echo user=$USER' http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66d05d5c/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index e68844e..e87218e 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -usermod -m -d $HOME jenkins +usermod -m -d `pwd` jenkins
logging-log4net git commit: builder-netstandard: set home directory to something deeper in the folder structure
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline dd2cba97b -> df782e3d6 builder-netstandard: set home directory to something deeper in the folder structure Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/df782e3d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/df782e3d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/df782e3d Branch: refs/heads/feature/cd-pipeline Commit: df782e3d68d6557926f12656d8560fb6fca3f3b6 Parents: dd2cba9 Author: Dominik PsennerAuthored: Sun Jul 9 09:12:20 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:12:20 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df782e3d/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index 3f44ea6..e553e85 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y nant git # add user jenkins, otherwise dotnet will not be able to find a place to cache artifacts RUN groupadd -r -g 12040 jenkins-slave -RUN useradd --home-dir /home/jenkins --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins +RUN useradd --home-dir /home/jenkins/jenkins-slave/workspace --shell /bin/bash --uid 10025 --gid 12040 --groups 12040 -p -M jenkins # include entrypoint to update the home directory of jenkins when docker starts COPY entrypoint.sh /usr/local/bin/entrypoint.sh
logging-log4net git commit: builder-netstandard: added entrypoint.sh script
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 78d23bb4f -> dd2cba97b builder-netstandard: added entrypoint.sh script Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd2cba97 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd2cba97 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd2cba97 Branch: refs/heads/feature/cd-pipeline Commit: dd2cba97bfd46f6df58cbc1e265756de5a394f8c Parents: 78d23bb Author: Dominik PsennerAuthored: Sun Jul 9 09:00:35 2017 +0200 Committer: Dominik Psenner Committed: Sun Jul 9 09:00:35 2017 +0200 -- buildtools/docker/builder-netstandard/entrypoint.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd2cba97/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh new file mode 100755 index 000..e68844e --- /dev/null +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +usermod -m -d $HOME jenkins +
logging-log4net git commit: builder-netstandard: force add of group
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 996b87e4b -> f62be04ea builder-netstandard: force add of group Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f62be04e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f62be04e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f62be04e Branch: refs/heads/feature/cd-pipeline Commit: f62be04ea6d5fe652a8160e6898956d49919a74e Parents: 996b87e Author: Dominik PsennerAuthored: Sat Jul 8 21:00:03 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 21:00:03 2017 +0200 -- buildtools/docker/builder-netstandard/useradd-jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f62be04e/buildtools/docker/builder-netstandard/useradd-jenkins.sh -- diff --git a/buildtools/docker/builder-netstandard/useradd-jenkins.sh b/buildtools/docker/builder-netstandard/useradd-jenkins.sh index 9a58ca2..f07e5e2 100755 --- a/buildtools/docker/builder-netstandard/useradd-jenkins.sh +++ b/buildtools/docker/builder-netstandard/useradd-jenkins.sh @@ -3,5 +3,5 @@ L_USER="jenkins" L_HOME="/home/jenkins" L_UID=10025 L_GID=12040 -groupadd --gid $L_GID $USER +groupadd --force --gid $L_GID $USER useradd --home-dir "$HOME" --shell /bin/bash --uid $L_UID --gid $L_GID --groups $L_GID -p -M $L_USER
logging-log4net git commit: builder-netstandard: attempt to set up jenkins user
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline de86adf0a -> 996b87e4b builder-netstandard: attempt to set up jenkins user Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/996b87e4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/996b87e4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/996b87e4 Branch: refs/heads/feature/cd-pipeline Commit: 996b87e4b9a0ef68170666bf4932f0ab5479e817 Parents: de86adf Author: Dominik PsennerAuthored: Sat Jul 8 20:51:28 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 20:51:28 2017 +0200 -- buildtools/docker/builder-netstandard/useradd-jenkins.sh | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/996b87e4/buildtools/docker/builder-netstandard/useradd-jenkins.sh -- diff --git a/buildtools/docker/builder-netstandard/useradd-jenkins.sh b/buildtools/docker/builder-netstandard/useradd-jenkins.sh index e89caf7..9a58ca2 100755 --- a/buildtools/docker/builder-netstandard/useradd-jenkins.sh +++ b/buildtools/docker/builder-netstandard/useradd-jenkins.sh @@ -1,5 +1,7 @@ #!/bin/bash -USER="jenkins" -HOME="/home/jenkins" -groupadd --gid `id -g` $USER -useradd --home-dir "$HOME" --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p -M "$USER" +L_USER="jenkins" +L_HOME="/home/jenkins" +L_UID=10025 +L_GID=12040 +groupadd --gid $L_GID $USER +useradd --home-dir "$HOME" --shell /bin/bash --uid $L_UID --gid $L_GID --groups $L_GID -p -M $L_USER
logging-log4net git commit: builder-netstandard: attempt to set up user jenkins
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline d0ced2cb6 -> de86adf0a builder-netstandard: attempt to set up user jenkins Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/de86adf0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/de86adf0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/de86adf0 Branch: refs/heads/feature/cd-pipeline Commit: de86adf0ac087b4e8bbf033ccab0dfb0f912c332 Parents: d0ced2c Author: Dominik PsennerAuthored: Sat Jul 8 20:25:41 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 20:25:41 2017 +0200 -- buildtools/docker/builder-netstandard/Dockerfile | 4 ++-- buildtools/docker/builder-netstandard/entrypoint.sh | 5 - buildtools/docker/builder-netstandard/useradd-jenkins.sh | 5 + 3 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/de86adf0/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index c5a8f4b..c769404 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -22,5 +22,5 @@ RUN apt-get update && apt-get install -y nant git # set up an entry point for the image that allows customization # before anything else is run on the container -RUN bash -c entrypoint.sh -#ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] +COPY "useradd-jenkins.sh" /usr/local/bin/useradd-jenkins.sh +RUN /usr/local/bin/useradd-jenkins.sh http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/de86adf0/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh deleted file mode 100755 index e89caf7..000 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -USER="jenkins" -HOME="/home/jenkins" -groupadd --gid `id -g` $USER -useradd --home-dir "$HOME" --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p -M "$USER" http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/de86adf0/buildtools/docker/builder-netstandard/useradd-jenkins.sh -- diff --git a/buildtools/docker/builder-netstandard/useradd-jenkins.sh b/buildtools/docker/builder-netstandard/useradd-jenkins.sh new file mode 100755 index 000..e89caf7 --- /dev/null +++ b/buildtools/docker/builder-netstandard/useradd-jenkins.sh @@ -0,0 +1,5 @@ +#!/bin/bash +USER="jenkins" +HOME="/home/jenkins" +groupadd --gid `id -g` $USER +useradd --home-dir "$HOME" --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p -M "$USER"
logging-log4net git commit: builder-netstandard: attempt to create jenkins user in docker
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 7236dc8c6 -> d0ced2cb6 builder-netstandard: attempt to create jenkins user in docker Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d0ced2cb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d0ced2cb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d0ced2cb Branch: refs/heads/feature/cd-pipeline Commit: d0ced2cb69d596ee03c86ba8e9af575175f6ac39 Parents: 7236dc8 Author: Dominik PsennerAuthored: Sat Jul 8 19:39:25 2017 +0200 Committer: Dominik Psenner Committed: Sat Jul 8 19:39:25 2017 +0200 -- Jenkinsfile | 1 - buildtools/docker/builder-netstandard/Dockerfile| 4 ++-- buildtools/docker/builder-netstandard/entrypoint.sh | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d0ced2cb/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index bc74a99..1f14f7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -161,7 +161,6 @@ pipeline { agent { dockerfile { dir 'buildtools/docker/builder-netstandard' - args '-a USER=jenkins' reuseNode true } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d0ced2cb/buildtools/docker/builder-netstandard/Dockerfile -- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile index a10b0c4..c5a8f4b 100644 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ b/buildtools/docker/builder-netstandard/Dockerfile @@ -22,5 +22,5 @@ RUN apt-get update && apt-get install -y nant git # set up an entry point for the image that allows customization # before anything else is run on the container -COPY entrypoint.sh /usr/local/bin/entrypoint.sh -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] +RUN bash -c entrypoint.sh +#ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d0ced2cb/buildtools/docker/builder-netstandard/entrypoint.sh -- diff --git a/buildtools/docker/builder-netstandard/entrypoint.sh b/buildtools/docker/builder-netstandard/entrypoint.sh index 59d9e71..e89caf7 100755 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ b/buildtools/docker/builder-netstandard/entrypoint.sh @@ -1,6 +1,5 @@ #!/bin/bash -echo "Setting up user '$USER' that maps to uid $(id -u)" - -export HOME=`pwd` +USER="jenkins" +HOME="/home/jenkins" groupadd --gid `id -g` $USER useradd --home-dir "$HOME" --shell /bin/bash --uid `id -u` --gid `id -g` --groups `id -g` -p -M "$USER"