Skip to content

Commit e8102fb

Browse files
author
Gabriel Monroy
committed
Merge pull request #1878 from mboersma/no-deis-base
ref(Dockerfiles): base Dockerfiles on ubuntu:14.04
2 parents 69d9b0b + 08d5b21 commit e8102fb

23 files changed

Lines changed: 213 additions & 147 deletions

‎builder/Dockerfile‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
1-
FROM deis/base:latest
2-
MAINTAINER OpDemand <info@opdemand.com>
1+
FROM ubuntu:14.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# install common packages
6+
RUN apt-get update && apt-get install -y curl
7+
8+
# install etcdctl
9+
RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
10+
&& chmod +x /usr/local/bin/etcdctl
11+
12+
# install confd
13+
RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
14+
&& chmod +x /usr/local/bin/confd
315

416
# install docker-in-docker
517
RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
618
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
19+
720
# install builder, docker, and hook dependencies
821
RUN apt-get update && apt-get install -yq \
922
openssh-server git \
1023
aufs-tools iptables lxc \
11-
curl \
1224
lxc-docker-1.2.0
1325

1426
# configure ssh server
1527
RUN rm /etc/ssh/ssh_host_*
1628
RUN dpkg-reconfigure openssh-server
1729
RUN mkdir -p /var/run/sshd
1830

19-
# install recent pip
20-
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
31+
# install pip
32+
RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
2133

2234
# install hook dependencies
23-
RUN pip install pyyaml requests
35+
RUN pip install pyyaml==3.11 requests==2.4.1
2436

2537
# install all i18n locales
2638
RUN ln -s /usr/share/i18n/SUPPORTED /var/lib/locales/supported.d/all && locale-gen
@@ -37,8 +49,8 @@ RUN echo "%git ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
3749

3850
# HACK: import progrium/cedarish as a tarball
3951
# see https://github.com/deis/deis/issues/1027
40-
RUN wget -O /progrium_cedarish.tar --progress=dot:giga \
41-
https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
52+
RUN curl -#SL -o /progrium_cedarish.tar \
53+
https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
4254

4355
# define the execution environment
4456
VOLUME /var/lib/docker

‎builder/README.md‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Deis Builder
22

3-
A Docker image that builds Docker images, for use in the
4-
[Deis](http://deis.io) open source PaaS.
3+
A Docker image that builds Docker images, for use in the [Deis](http://deis.io/) open source PaaS.
54

6-
[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/builder/)
5+
This Docker image is based on the official
6+
[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
77

8-
[**Trusted Build**](https://index.docker.io/u/deis/builder/)
9-
10-
This Docker image is based on the trusted build
11-
[deis/base](https://index.docker.io/u/deis/base/), which itself is based
12-
on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
13-
14-
Please add any issues you find with this software to the
15-
[Deis project](https://github.com/deis/deis/issues).
8+
Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
9+
the [Deis Project](https://github.com/deis/deis).
1610

1711
## Usage
1812

19-
* `make build` builds the *deis/builder* image inside a vagrant VM
20-
* `make run` installs and starts *deis/builder*, then displays log
21-
output from the container
13+
Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
14+
install, and start **deis/builder**.
2215

2316
## Environment Variables
2417

@@ -29,6 +22,7 @@ Please add any issues you find with this software to the
2922
its configuration (default: */deis/builder*)
3023
* **ETCD_TTL** sets the time-to-live before etcd purges a configuration
3124
value, in seconds (default: *10*)
25+
* **STORAGE_DRIVER** sets the Docker-in-Docker storage driver (default: btrfs)
3226
* **PORT** sets the TCP port on which the builder listens (default: *2222*)
3327

3428
## License

‎cache/Dockerfile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
FROM deis/base:latest
2-
MAINTAINER OpDemand <info@opdemand.com>
1+
FROM ubuntu:14.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# install common packages
6+
RUN apt-get update && apt-get install -y curl
7+
8+
# install etcdctl
9+
RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
10+
&& chmod +x /usr/local/bin/etcdctl
311

412
# build Redis from source
5-
RUN buildDeps='gcc libc6-dev make curl'; \
6-
export DEBIAN_FRONTEND=noninteractive; \
13+
RUN buildDeps='gcc libc6-dev make'; \
714
set -x; \
815
apt-get update && apt-get install -y $buildDeps net-tools --no-install-recommends \
916
&& rm -rf /var/lib/apt/lists/* \

‎cache/README.md‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
# Deis Cache
22

3-
A cache server for use in the [Deis](http://deis.io) open source PaaS.
3+
A Redis cache server for use in the [Deis](http://deis.io/) open source PaaS.
44

5-
[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/cache/)
5+
This Docker image is based on the official
6+
[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
67

7-
[**Trusted Build**](https://index.docker.io/u/deis/cache/)
8-
9-
This Docker image is based on the trusted build
10-
[deis/base](https://index.docker.io/u/deis/base/), which itself is based
11-
on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
12-
13-
Please add any issues you find with this software to the
14-
[Deis project](https://github.com/deis/deis/issues).
8+
Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
9+
the [Deis Project](https://github.com/deis/deis).
1510

1611
## Usage
1712

18-
* `make build` builds the *deis/cache* image inside a vagrant VM
19-
* `make run` installs and starts *deis/cache*, then displays log output from
20-
the container
13+
Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
14+
install, and start **deis/cache**.
2115

2216
## Environment Variables
2317

‎controller/Dockerfile‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
1-
FROM deis/base:latest
2-
MAINTAINER OpDemand <info@opdemand.com>
1+
FROM ubuntu:14.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# install common packages
6+
RUN apt-get update && apt-get install -y curl
7+
8+
# install etcdctl
9+
RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
10+
&& chmod +x /usr/local/bin/etcdctl
11+
12+
# install confd
13+
RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
14+
&& chmod +x /usr/local/bin/confd
315

416
# install required system packages
517
# HACK: install git so we can install bacongobbler's fork of django-fsm
618
# install openssh-client for temporary fleetctl wrapper
719
RUN apt-get update && \
820
apt-get install -yq python-dev libpq-dev libyaml-dev git openssh-client
921

10-
# install recent pip
11-
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
22+
# install pip
23+
RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
1224

1325
# add a deis user that has passwordless sudo (for now)
1426
RUN useradd deis --groups sudo --home-dir /app --shell /bin/bash

‎controller/README.md‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
# Deis Controller
22

3-
A RESTful API server for use in the [Deis](http://deis.io) open
4-
source PaaS.
3+
A RESTful API server for use in the [Deis](http://deis.io) open source PaaS.
54

6-
[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/controller/)
75

8-
[**Trusted Build**](https://index.docker.io/u/deis/controller/)
6+
This Docker image is based on the official
7+
[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
98

10-
This Docker image is based on the trusted build
11-
[deis/base](https://index.docker.io/u/deis/base/), which itself is based
12-
on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
13-
14-
Please add any issues you find with this software to the
15-
[Deis project](https://github.com/deis/deis/issues).
9+
Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
10+
the [Deis Project](https://github.com/deis/deis).
1611

1712
## Usage
1813

19-
* `make build` builds the *deis/controller* image inside a vagrant VM
20-
* `make run` installs and starts *deis/controller*, then displays log
21-
output from the container
22-
* `make test` runs unit tests for the controller and reports results
14+
Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
15+
install, and start **deis/logger**.
2316

2417
## Environment Variables
2518

‎database/Dockerfile‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
FROM deis/base:latest
2-
MAINTAINER OpDemand <info@opdemand.com>
1+
FROM ubuntu:14.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# install common packages
6+
RUN apt-get update && apt-get install -y curl
7+
8+
# install etcdctl
9+
RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
10+
&& chmod +x /usr/local/bin/etcdctl
11+
12+
# install confd
13+
RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
14+
&& chmod +x /usr/local/bin/confd
315

416
# install 9.3 from postgresql.org repository
5-
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
6-
RUN wget --quiet --no-check-certificate -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
17+
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" > /etc/apt/sources.list.d/pgdg.list
18+
RUN curl -sk https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
719
RUN apt-get update && apt-get install -yq postgresql-9.3 && /etc/init.d/postgresql stop
820

921
# define the execution environment

‎database/README.md‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Deis Database
22

3-
A PostgreSQL database for use in the [Deis](http://deis.io) open
4-
source PaaS.
3+
A PostgreSQL database for use in the [Deis](http://deis.io) open source PaaS.
54

6-
[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/database/)
5+
This Docker image is based on the official
6+
[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
77

8-
[**Trusted Build**](https://index.docker.io/u/deis/database/)
9-
10-
This Docker image is based on the trusted build
11-
[deis/base](https://index.docker.io/u/deis/base/), which itself is based
12-
on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
13-
14-
Please add any issues you find with this software to the
15-
[Deis project](https://github.com/deis/deis/issues).
8+
Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
9+
the [Deis Project](https://github.com/deis/deis).
1610

1711
## Usage
1812

19-
* `make build` builds the *deis/database* image inside a vagrant VM
20-
* `make run` installs and starts *deis/database*, then displays log
21-
output from the container
13+
Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
14+
install, and start **deis/database**.
2215

2316
## Environment Variables
2417

‎database/bin/boot‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if [[ ! -d /var/lib/postgresql/9.3/main ]]; then
2020
mkdir -p /var/lib/postgresql/9.3
2121
chown -R postgres:postgres /var/lib/postgresql
2222
sudo -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /var/lib/postgresql/9.3/main
23+
else
24+
chown -R postgres:postgres /var/lib/postgresql
2325
fi
2426

2527
# wait for etcd to be available

‎database/conf.d/pg_hba.conf.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[template]
22
src = "pg_hba.conf"
33
dest = "/etc/postgresql/9.3/main/pg_hba.conf"
4-
uid = 101
5-
gid = 104
4+
uid = 102
5+
gid = 106
66
mode = "0640"
77
keys = [
88
"/deis/database",

0 commit comments

Comments
 (0)