Modified jenkins dockerfile and removing drupal image

flemeur · Jul 12, 2015 · 6521384 · 6521384
1 parent 8762bf2
commit 6521384
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,3 @@ Installs nginx and serves from `/var/www` by default.
 
 Supervisor, nginx and php-fpm.
 
-## Drupal
-
-The Drupal image is based on the Nginx & PHP image and installs composer and drush.
diff --git a/drupal/Dockerfile b/drupal/Dockerfile
diff --git a/drupal/conf.d/nginx-drupal.conf b/drupal/conf.d/nginx-drupal.conf
diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
@@ -4,6 +4,17 @@ MAINTAINER Flemming Andersen <[email protected]>
 
 USER root
 
-RUN apt-get update && apt-get install -y make && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y curl git mercurial make binutils gcc build-essential && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sS https://godeb.s3.amazonaws.com/godeb-amd64.tar.gz | tar -xz && chmod +x ./godeb
+
+RUN ./godeb install && rm -f ./godeb ./go_*.deb
 
 USER jenkins
+
+RUN mkdir -p $HOME/go
+
+ENV GOPATH $HOME/go
+
+ENV PATH $PATH:$GOPATH/bin
+