Merge pull request #2156 from mboersma/ubuntu-debootstrap

Matthew Fisher · Matthew Fisher · commit b62454c575bf · 2014-10-17T10:03:50.000-07:00
ref(Dockerfiles): use ubuntu-debootstrap:14.04 as base image
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/builder/README.md b/builder/README.md
@@ -3,7 +3,7 @@
 A Docker image that builds Docker images, for use in the [Deis](http://deis.io/) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/cache/Dockerfile b/cache/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/cache/README.md b/cache/README.md
@@ -3,7 +3,7 @@
 A Redis cache server for use in the [Deis](http://deis.io/) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/controller/README.md b/controller/README.md
@@ -4,7 +4,7 @@ A RESTful API server for use in the [Deis](http://deis.io) open source PaaS.
 
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/database/README.md b/database/README.md
@@ -3,7 +3,7 @@
 A PostgreSQL database for use in the [Deis](http://deis.io) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/deisctl/units/deis-logger-data.service b/deisctl/units/deis-logger-data.service
@@ -4,8 +4,8 @@ Description=deis-logger-data
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStartPre=/bin/sh -c "docker history ubuntu:14.04 >/dev/null 2>&1 || docker pull ubuntu:14.04"
-ExecStart=/bin/sh -c "docker inspect deis-logger-data >/dev/null 2>&1 || docker run --name deis-logger-data -v /var/log/deis ubuntu:14.04 /bin/true"
+ExecStartPre=/bin/sh -c "docker history ubuntu-debootstrap:14.04 >/dev/null 2>&1 || docker pull ubuntu-debootstrap:14.04"
+ExecStart=/bin/sh -c "docker inspect deis-logger-data >/dev/null 2>&1 || docker run --name deis-logger-data -v /var/log/deis ubuntu-debootstrap:14.04 /bin/true"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/logger/README.md b/logger/README.md
@@ -3,7 +3,7 @@
 A system logger for use in the [Deis](http://deis.io) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/logger/tests/logger_test.go b/logger/tests/logger_test.go
@@ -19,7 +19,7 @@ func TestLogger(t *testing.T) {
 	defer cli.CmdRm("-f", etcdName)
 	dataName := "deis-logger-data-" + tag
 	dockercli.RunDeisDataTest(t, "--name", dataName,
-		"-v", "/var/log/deis", "ubuntu:14.04", "/bin/true")
+		"-v", "/var/log/deis", "ubuntu-debootstrap:14.04", "/bin/true")
 	host, port := utils.HostAddress(), utils.RandomPort()
 	fmt.Printf("--- Run deis/logger:%s at %s:%s\n", tag, host, port)
 	name := "deis-logger-" + tag
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/registry/README.md b/registry/README.md
@@ -3,7 +3,7 @@
 A Docker image registry for use in the [Deis](http://deis.io) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/router/Dockerfile b/router/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y libgeoip1 curl && apt-get clean
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
@@ -13,6 +13,9 @@ RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdem
 RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-git-b8e693c \
     && chmod +x /usr/local/bin/confd
 
+# install common packages
+RUN apt-get update && apt-get install -y libgeoip1
+
 WORKDIR /app
 
 EXPOSE 80 2222
diff --git a/router/README.md b/router/README.md
@@ -3,7 +3,7 @@
 An nginx proxy for use in the [Deis](http://deis.io) open source PaaS.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
 the [Deis Project](https://github.com/deis/deis).
diff --git a/router/parent/Dockerfile b/router/parent/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ADD . /tmp
 
diff --git a/store/README.md b/store/README.md
@@ -7,7 +7,7 @@ The bin/boot scripts and Dockerfiles were inspired by
 Seán C. McCord's [docker-ceph](https://github.com/Ulexus/docker-ceph) repository.
 
 This Docker image is based on the official
-[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
+[ubuntu-debootstrap:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
 Please add any issues you find with this software to the
 [Deis project](https://github.com/deis/deis/issues).
diff --git a/store/base/Dockerfile b/store/base/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -yq curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
diff --git a/tests/bin/prime-docker-images.sh b/tests/bin/prime-docker-images.sh
@@ -11,7 +11,7 @@ docker rm `docker ps -a -q`
 docker rmi -f `docker images -q`
 
 # Pull Deis testing essentials
-docker pull ubuntu:14.04
+docker pull ubuntu-debootstrap:14.04
 docker pull deis/slugbuilder:latest
 docker pull deis/slugrunner:latest
 docker pull deis/test-etcd:latest
diff --git a/tests/etcdutils/Dockerfile b/tests/etcdutils/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu-debootstrap:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # install common packages
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl net-tools sudo
 
 # install etcdctl
 RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
