Skip to content

Commit

Permalink
chore(*): update Docker base image to alpine:3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Oct 7, 2015
1 parent 1149eb5 commit ceef3d2
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion builder/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion database/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-builder.service
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-database.service
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-mesos-master.service
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RestartSec=20
TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill deis-mesos-master
ExecStartPre=-/usr/bin/docker rm deis-mesos-master
ExecStartPre=/bin/sh -c "docker inspect deis-mesos-master-data >/dev/null 2>&1 || docker run --name deis-mesos-master-data -v /tmp/mesos-master alpine:3.1 /bin/true"
ExecStartPre=/bin/sh -c "docker inspect deis-mesos-master-data >/dev/null 2>&1 || docker run --name deis-mesos-master-data -v /tmp/mesos-master alpine:3.2 /bin/true"
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/mesos-master` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
ExecStart=/usr/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/mesos-master` && docker run --volumes-from=deis-mesos-master-data --name=deis-mesos-master --privileged --net=host -e HOST=$COREOS_PRIVATE_IPV4 $IMAGE"
ExecStop=-/usr/bin/docker stop deis-mesos-master
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-store-daemon.service
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Description=deis-store-daemon
[Service]
EnvironmentFile=/etc/environment
TimeoutStartSec=20m
ExecStartPre=/bin/sh -c "docker inspect deis-store-daemon-data >/dev/null 2>&1 || docker run --name deis-store-daemon-data -v /var/lib/ceph/osd alpine:3.1 /bin/true"
ExecStartPre=/bin/sh -c "docker inspect deis-store-daemon-data >/dev/null 2>&1 || docker run --name deis-store-daemon-data -v /var/lib/ceph/osd alpine:3.2 /bin/true"
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/store-daemon` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
ExecStartPre=/bin/sh -c "docker inspect deis-store-daemon >/dev/null 2>&1 && docker rm -f deis-store-daemon >/dev/null 2>&1 || true"
ExecStartPre=/usr/bin/sleep 10
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-store-monitor.service
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Description=deis-store-monitor
[Service]
EnvironmentFile=/etc/environment
TimeoutStartSec=20m
ExecStartPre=/bin/sh -c "docker inspect deis-store-monitor-data >/dev/null 2>&1 || docker run --name deis-store-monitor-data -v /etc/ceph -v /var/lib/ceph/mon alpine:3.1 /bin/true"
ExecStartPre=/bin/sh -c "docker inspect deis-store-monitor-data >/dev/null 2>&1 || docker run --name deis-store-monitor-data -v /etc/ceph -v /var/lib/ceph/mon alpine:3.2 /bin/true"
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/store-monitor` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
ExecStartPre=/bin/sh -c "etcdctl set /deis/store/hosts/$COREOS_PRIVATE_IPV4 `hostname` >/dev/null"
ExecStartPre=/bin/sh -c "docker inspect deis-store-monitor >/dev/null 2>&1 && docker rm -f deis-store-monitor >/dev/null 2>&1 || true"
Expand Down
2 changes: 1 addition & 1 deletion deisctl/units/deis-zookeeper.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ EnvironmentFile=/etc/environment
Restart=on-failure
RestartSec=20
TimeoutStartSec=0
ExecStartPre=/bin/sh -c "docker inspect zookeeper-data >/dev/null 2>&1 || docker run --name zookeeper-data -v /opt/zookeeper-data alpine:3.1 /bin/true"
ExecStartPre=/bin/sh -c "docker inspect zookeeper-data >/dev/null 2>&1 || docker run --name zookeeper-data -v /opt/zookeeper-data alpine:3.2 /bin/true"
ExecStartPre=-/usr/bin/docker kill deis-zookeeper
ExecStartPre=-/usr/bin/docker rm deis-zookeeper
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/zookeeper` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
Expand Down
2 changes: 1 addition & 1 deletion logger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[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).
Expand Down
2 changes: 1 addition & 1 deletion logger/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

ENTRYPOINT ["/bin/logger"]
CMD ["--enable-publish"]
Expand Down
2 changes: 1 addition & 1 deletion logspout/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

ENV DOCKER_HOST unix:///tmp/docker.sock
ENV ROUTESPATH /tmp
Expand Down
2 changes: 1 addition & 1 deletion mesos/zookeeper/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

ENV JAVA_HOME /jre
ENV PATH ${PATH}:${JAVA_HOME}/bin
Expand Down
2 changes: 1 addition & 1 deletion publisher/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

# install curl in the image so it is possible to get the runtime
# profiling information without any additional package installation.
Expand Down
2 changes: 1 addition & 1 deletion router/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

# install common packages
RUN apk add --update-cache \
Expand Down
2 changes: 1 addition & 1 deletion router/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[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).
Expand Down
2 changes: 1 addition & 1 deletion store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[alpine:3.1](https://registry.hub.docker.com/_/alpine/) image.
[alpine:3.2](https://registry.hub.docker.com/_/alpine/) image.

Please add any issues you find with this software to the
[Deis project](https://github.com/deis/deis/issues).
Expand Down
2 changes: 1 addition & 1 deletion swarm/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

COPY bin /app/bin/
WORKDIR /app/bin
Expand Down
2 changes: 1 addition & 1 deletion tests/bin/prime-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ docker rm -v `docker ps -a -q`
docker rmi -f `docker images -q`

# Pull Deis testing essentials
docker pull alpine:3.1
docker pull alpine:3.2
2 changes: 1 addition & 1 deletion tests/fixtures/mock-store/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/test-etcd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.1
FROM alpine:3.2

# install common packages
RUN apk add --update-cache curl tar && rm -rf /var/cache/apk/*
Expand Down

0 comments on commit ceef3d2

Please sign in to comment.