Changeset 11146

Timestamp:

Mar 18, 2016, 11:41:25 PM (8 years ago)

Author:

landauf

Message:

fixed jenkins-slave.
let orxonox build environment also depend on jenkins-slave

Location:

build/dockerfiles

Files:

• orxonox_build/Dockerfile (modified) (1 diff)
• orxonox_jenkins-slave/Dockerfile (modified) (1 diff)

build/dockerfiles/orxonox_build/Dockerfile

@@ -1 @@
-FROM ubuntu:14.04
+FROM orxonox/jenkins-slave
 
 MAINTAINER Fabian 'x3n' Landau

build/dockerfiles/orxonox_jenkins-slave/Dockerfile

@@ -12 +12 @@
 
 RUN adduser --quiet jenkins
-RUN RUN echo "jenkins:jenkins" | chpasswd
+RUN echo "jenkins:jenkins" | chpasswd
 
 EXPOSE 22