Merge pull request #4580 from mboersma/alpine-32

chore(*): update Docker base image to alpine:3.2

Author: mboersma

builder/README.md

@@ -4,7 +4,7 @@ Builder creates Docker images to be run elsewhere on the Deis platform.
 Builder itself also runs in a Docker container.
 
 This Docker image is based on the official
-[alpine:3.1](https://registry.hub.docker.com/_/alpine/) image.
+[alpine:3.2](https://registry.hub.docker.com/_/alpine/) 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).

builder/rootfs/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.1
+FROM alpine:3.2
 
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*

controller/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.1
+FROM alpine:3.2
 
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*

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
-[alpine:3.1](https://registry.hub.docker.com/_/alpine/) image.
+[alpine:3.2](https://registry.hub.docker.com/_/alpine/) 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).

controller/requirements.txt

@@ -14,7 +14,6 @@ paramiko==1.15.2
 psycopg2==2.6.1
 python-etcd==0.3.2
 PyYAML==3.11
-setproctitle==1.1.8
 static==1.1.1
 South==1.0.2
 python-ldap==2.4.19

controller/templates/gconf.py

@@ -9,7 +9,6 @@
         workers = multiprocessing.cpu_count() * 2 + 1
     except NotImplementedError:
         workers = 8
-proc_name = 'deis-controller'
 timeout = 1200
 pidfile = '/tmp/gunicorn.pid'
 loglevel = 'info'

database/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.1
+FROM alpine:3.2
 
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*

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
-[alpine:3.1](https://registry.hub.docker.com/_/alpine/) image.
+[alpine:3.2](https://registry.hub.docker.com/_/alpine/) 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).

deisctl/units/deis-builder.service

@@ -4,7 +4,7 @@ Description=deis-builder
 [Service]
 EnvironmentFile=/etc/environment
 TimeoutStartSec=30m
-ExecStartPre=/bin/sh -c "docker inspect deis-builder-data >/dev/null 2>&1 || docker run --name deis-builder-data -v /var/lib/docker alpine:3.1 /bin/true"
+ExecStartPre=/bin/sh -c "docker inspect deis-builder-data >/dev/null 2>&1 || docker run --name deis-builder-data -v /var/lib/docker alpine:3.2 /bin/true"
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-builder >/dev/null 2>&1 && docker rm -f deis-builder || true"
 ExecStartPre=-/bin/sh -c "/sbin/losetup -f"

deisctl/units/deis-database.service

@@ -4,7 +4,7 @@ Description=deis-database
 [Service]
 EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
-ExecStartPre=/bin/sh -c "docker inspect deis-database-data >/dev/null 2>&1 || docker run --name deis-database-data -v /var/lib/postgresql alpine:3.1 /bin/true"
+ExecStartPre=/bin/sh -c "docker inspect deis-database-data >/dev/null 2>&1 || docker run --name deis-database-data -v /var/lib/postgresql alpine:3.2 /bin/true"
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/database` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-database >/dev/null 2>&1 && docker rm -f deis-database >/dev/null 2>&1 || true"
 ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/database` && docker run --name deis-database --rm --volumes-from=deis-database-data -p 5432:5432 -e EXTERNAL_PORT=5432 -e HOST=$COREOS_PRIVATE_IPV4 $IMAGE"