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 Psenner <dpsen...@apache.org> Authored: Sun Jul 9 16:38:55 2017 +0200 Committer: Dominik Psenner <dpsen...@apache.org> 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..0000000 --- a/buildtools/docker/builder-netstandard/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -#usermod -m -d `pwd` jenkins -
