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 Psenner <dpsen...@apache.org> Authored: Sat Jul 8 19:39:25 2017 +0200 Committer: Dominik Psenner <dpsen...@apache.org> 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"
