Organize the docker images and simplify the build commands

.gitignore

@@ -1 +1,3 @@
 *.out
+phusion/agent/Dockerfile
+phusion/server/Dockerfile

README.md

@@ -1,27 +1,12 @@
 This is the repository which contains the Dockerfiles and supporting scripts for:
 
-https://registry.hub.docker.com/u/gocd/gocd-dev/
-
 https://registry.hub.docker.com/u/gocd/gocd-agent/
 
 https://registry.hub.docker.com/u/gocd/gocd-server/
 
-https://registry.hub.docker.com/u/gocd/gocd-build-installer/
-
 Follow those URLs for more details about the actual images. For instructions to build the Docker images yourself, check
 the first line of each Dockerfile.
 
-## Version control system clients
-
-To keep image size minimal the GoCD server image only contains the Git client. To add other clients create your own image using this as a base.
-
-e.x. to add Subversion:
-```
-FROM gocd/gocd-server:<version>
-RUN apk --no-cache add subversion
-```
-
-
 ## Contributing
 
 We encourage you to contribute to Go. For information on contributing to this project, please see our [contributor's guide](http://www.go.cd/contribute).
@@ -30,7 +15,7 @@ A lot of useful information like links to user documentation, design documentati
 ## License
 
 ```plain
-Copyright 2015 ThoughtWorks, Inc.
+Copyright 2016 ThoughtWorks, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Dockerfile.alpine-gocd-server → alpine/server/Dockerfile

@@ -1,4 +1,4 @@
-# Build using: docker build --build-arg GO_VERSION=16.x.x-xxxx -f Dockerfile.alpine-gocd-server --tag=alpine-gocd-server .
+# Build using: docker build --build-arg GO_VERSION=16.x.x-xxxx . --t alpine-gocd-server 
 
 FROM delitescere/jdk:latest
 #16.5.0-3305
@@ -26,7 +26,7 @@ VOLUME ["/config", "/artifacts", "/logs"]
 EXPOSE 8153 8154
 
 # Dockerized startup script.  Should work on more than Alpine, but YMMV.
-COPY gocd-server/alpine-start.sh /start
+COPY alpine-start.sh /start
 
 CMD ["/start"]
 

Dockerfile.centos → centos/agent/Dockerfile

@@ -1,7 +1,10 @@
-# docker build --rm -f Dockerfile.centos -t local/centos .
+# docker build --build-arg GO_VERSION=16.x.x-xxxx --rm -t gocd-agent . 
 FROM centos:7
 MAINTAINER "GoCD" <[email protected]>
-ENV container docker
+
+ARG GO_VERSION="16.8.0-3889"
+ENV TINI_VERSION v0.9.0
+
 RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
 rm -f /lib/systemd/system/multi-user.target.wants/*;\
 rm -f /etc/systemd/system/*.wants/*;\
@@ -11,9 +14,18 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
 rm -f /lib/systemd/system/basic.target.wants/*;\
 rm -f /lib/systemd/system/anaconda.target.wants/*; \
 yum install -y java-1.8.0-openjdk-headless git;
+
 VOLUME [ "/sys/fs/cgroup" ]
 
-ENV TINI_VERSION v0.9.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
+
+
+ADD https://download.go.cd/experimental/binaries/$GO_VERSION/rpm/go-agent-$GO_VERSION.noarch.rpm /tmp/go-agent.rpm
+
+WORKDIR /tmp
+RUN yum install -y /tmp/go-agent.rpm; yum clean all; rm -f /etc/default/go-server
+
+# Run your program under Tini
+CMD PRODUCTION_MODE=N /usr/share/go-agent/agent.sh

Dockerfile.gocd-agent.erb → phusion/agent/Dockerfile.erb

@@ -1,6 +1,6 @@
 <% abort("Missing environment variable GO_VERSION") if ENV['GO_VERSION'].nil? %>
-# Create docker file using : GO_VERSION=16.x.x-xxxx erb Dockerfile.gocd-agent.erb > Dockerfile.gocd-agent.out
-# Build using              : docker build -f Dockerfile.gocd-agent.out --tag=gocd-agent .
+# Create docker file using : GO_VERSION=16.x.x-xxxx erb Dockerfile.erb > Dockerfile
+# Build using              : docker build . -t gocd-agent
 
 FROM phusion/baseimage:0.9.18
 MAINTAINER GoCD <go-cd-dev@googlegroups.com>
@@ -11,7 +11,7 @@ RUN apt-get upgrade -y
 RUN apt-get install -y -q unzip openjdk-7-jre-headless git mercurial subversion
 
 RUN mkdir /etc/service/go-agent
-ADD gocd-agent/go-agent-start.sh /etc/service/go-agent/run
+ADD go-agent-start.sh /etc/service/go-agent/run
 
 ADD https://download.go.cd/binaries/<%= ENV['GO_VERSION'] %>/deb/go-agent_<%= ENV['GO_VERSION'] %>_all.deb /tmp/go-agent.deb
 

Dockerfile.gocd-server.erb → phusion/server/Dockerfile.erb

@@ -1,6 +1,6 @@
 <% abort("Missing environment variable GO_VERSION") if ENV['GO_VERSION'].nil? %>
-# Create docker file using : GO_VERSION=16.x.x-xxxx erb Dockerfile.gocd-server.erb > Dockerfile.gocd-sever.out
-# Build using              : docker build -f Dockerfile.gocd-server.out --tag=gocd-server .
+# Create docker file using : GO_VERSION=16.x.x-xxxx erb Dockerfile.erb > Dockerfile
+# Build using              : docker build . -t gocd-server 
 
 FROM phusion/baseimage:0.9.18
 MAINTAINER GoCD <go-cd-dev@googlegroups.com>
@@ -11,8 +11,8 @@ RUN apt-get upgrade -y
 RUN apt-get install -y -q unzip openjdk-7-jre-headless git mercurial subversion
 
 RUN mkdir /etc/service/go-server
-ADD gocd-server/go-common-scripts.sh /etc/service/go-server/go-common-scripts.sh
-ADD gocd-server/go-server-start.sh /etc/service/go-server/run
+ADD go-common-scripts.sh /etc/service/go-server/go-common-scripts.sh
+ADD go-server-start.sh /etc/service/go-server/run
 
 ADD https://download.go.cd/binaries/<%= ENV['GO_VERSION'] %>/deb/go-server_<%= ENV['GO_VERSION'] %>_all.deb /tmp/go-server.deb