Removed the initctl hack from the Dockerfiles and added a new Docker image to be used as a basic Jenkins slave build node.

Author: Ervin Varga

Diff for: .project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>docker-images</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Diff for: graphite/Dockerfile

@@ -10,11 +10,6 @@ MAINTAINER Ervin Varga <[email protected]>
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
 RUN apt-get update
 
-# Hack for initctl on Ubuntu Linux.
-# See: https://github.com/dotcloud/docker/issues/1024
-RUN dpkg-divert --local --rename --add /sbin/initctl
-RUN ln -s /bin/true /sbin/initctl
-
 # Install common stuff needed by the rest of this build file.
 RUN apt-get -y install python-pip memcached python-memcache python-ldap
 RUN apt-get -y install gcc

Diff for: jenkins-slave/Dockerfile

@@ -0,0 +1,25 @@
+# This Dockerfile is used to build an image containing basic stuff to be used as a Jenkins slave build node.
+
+FROM ubuntu:latest
+MAINTAINER Ervin Varga <[email protected]>
+
+# Make sure the package repository is up to date.
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
+RUN apt-get update
+
+# Install a basic SSH server
+RUN apt-get -y install openssh-server
+RUN mkdir -p /var/run/sshd
+
+# Install JDK 7 (latest edition)
+RUN apt-get -y install openjdk-7-jdk
+
+# Add user jenkins to the image
+RUN adduser --quiet jenkins
+# Set password for the jenkins user (you may want to alter this).
+RUN echo "jenkins:jenkins" | chpasswd
+
+# Standard SSH port
+EXPOSE 22
+
+CMD ["/usr/sbin/sshd", "-D"]

Diff for: ubuntu-js/Dockerfile

@@ -12,11 +12,6 @@ MAINTAINER Ervin Varga <[email protected]>
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
 RUN apt-get update
 
-# Hack for initctl on Ubuntu Linux.
-# See: https://github.com/dotcloud/docker/issues/1024
-RUN dpkg-divert --local --rename --add /sbin/initctl
-RUN ln -s /bin/true /sbin/initctl
-
 # Install common stuff needed by the rest of this build file.
 RUN apt-get -y install bzip2
 RUN apt-get -y install software-properties-common