[Orxonox-commit 6502] r11146 - in build/dockerfiles: orxonox_build orxonox_jenkins-slave

[landauf at orxonox.net]

Author: landauf
Date: 2016-03-18 23:41:25 +0100 (Fri, 18 Mar 2016)
New Revision: 11146

Modified:
   build/dockerfiles/orxonox_build/Dockerfile
   build/dockerfiles/orxonox_jenkins-slave/Dockerfile
Log:
fixed jenkins-slave.
let orxonox build environment also depend on jenkins-slave

Modified: build/dockerfiles/orxonox_build/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_build/Dockerfile	2016-03-18 22:03:53 UTC (rev 11145)
+++ build/dockerfiles/orxonox_build/Dockerfile	2016-03-18 22:41:25 UTC (rev 11146)
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM orxonox/jenkins-slave
 
 MAINTAINER Fabian 'x3n' Landau
 

Modified: build/dockerfiles/orxonox_jenkins-slave/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2016-03-18 22:03:53 UTC (rev 11145)
+++ build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2016-03-18 22:41:25 UTC (rev 11146)
@@ -11,7 +11,7 @@
 RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
 
 RUN adduser --quiet jenkins
-RUN RUN echo "jenkins:jenkins" | chpasswd
+RUN echo "jenkins:jenkins" | chpasswd
 
 EXPOSE 22