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 Psenner <dpsen...@apache.org> Authored: Sat Aug 19 11:05:47 2017 +0200 Committer: Dominik Psenner <dpsen...@apache.org> 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 0000000..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..0000000 --- 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 0000000..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 +RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces + +# add jenkins user that maps to the custom workspace +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 + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/builder-netstandard/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile deleted file mode 100644 index 6fd683a..0000000 --- a/buildtools/docker/builder-netstandard/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -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 -RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces - -# add jenkins user that maps to the custom workspace -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 - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/run-builder-netstandard-1.3.sh ---------------------------------------------------------------------- diff --git a/buildtools/docker/run-builder-netstandard-1.3.sh b/buildtools/docker/run-builder-netstandard-1.3.sh new file mode 100755 index 0000000..f97f54b --- /dev/null +++ b/buildtools/docker/run-builder-netstandard-1.3.sh @@ -0,0 +1,18 @@ +#!/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) + echo "Path is not accessible to the script" + exit 1 # fail +fi + +WORKING_DIR="$1" +if [ -z "$WORKING_DIR" ]; then + WORKING_DIR=$(pwd) +fi + +$MY_PATH/run.sh "builder-netstandard-1.3" $WORKING_DIR + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/run-builder-netstandard.sh ---------------------------------------------------------------------- diff --git a/buildtools/docker/run-builder-netstandard.sh b/buildtools/docker/run-builder-netstandard.sh deleted file mode 100755 index e3d2794..0000000 --- a/buildtools/docker/run-builder-netstandard.sh +++ /dev/null @@ -1,18 +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) - echo "Path is not accessible to the script" - exit 1 # fail -fi - -WORKING_DIR="$1" -if [ -z "$WORKING_DIR" ]; then - WORKING_DIR=$(pwd) -fi - -$MY_PATH/run.sh "builder-netstandard" $WORKING_DIR -