You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/08/19 16:15:14 UTC
[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 Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:53:46 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
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