diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-30 14:39:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-30 14:39:50 +0000 |
| commit | 6e81e4829e0f4dfe17a6fa09f0353dd898cb7029 (patch) | |
| tree | 2a8fd3b6939de2865e60c586def61de6a93f82ac /docker/ubuntu/binary | |
| parent | 6370bf25cb3c624067d7327ef54bf2fe654c87be (diff) | |
| parent | 70de54216554a6f382ad0529bd4fe46835e6b5b8 (diff) | |
| download | kolla-6e81e4829e0f4dfe17a6fa09f0353dd898cb7029.tar.gz kolla-6e81e4829e0f4dfe17a6fa09f0353dd898cb7029.zip | |
Merge "Add base image for Ubuntu"
Diffstat (limited to 'docker/ubuntu/binary')
| -rw-r--r-- | docker/ubuntu/binary/base/Dockerfile | 15 | ||||
| l--------- | docker/ubuntu/binary/base/build | 1 | ||||
| l--------- | docker/ubuntu/binary/base/kolla-common.sh | 1 | ||||
| l--------- | docker/ubuntu/binary/base/service_hosts.sh | 1 |
4 files changed, 18 insertions, 0 deletions
diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile new file mode 100644 index 000000000..56dbe6cb3 --- /dev/null +++ b/docker/ubuntu/binary/base/Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu:trusty +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN apt-get update \ + && apt-get install -y software-properties-common \ + && add-apt-repository cloud-archive:kilo \ + && apt-get update \ + && apt-get upgrade -y \ + && apt-get dist-upgrade -y \ + && apt-get install -y \ + crudini \ + openssl \ + && apt-get clean + +COPY service_hosts.sh kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/binary/base/build b/docker/ubuntu/binary/base/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/ubuntu/binary/base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/base/kolla-common.sh b/docker/ubuntu/binary/base/kolla-common.sh new file mode 120000 index 000000000..c265c62f7 --- /dev/null +++ b/docker/ubuntu/binary/base/kolla-common.sh @@ -0,0 +1 @@ +../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/base/service_hosts.sh b/docker/ubuntu/binary/base/service_hosts.sh new file mode 120000 index 000000000..06e045440 --- /dev/null +++ b/docker/ubuntu/binary/base/service_hosts.sh @@ -0,0 +1 @@ +../../../common/base/service_hosts.sh
\ No newline at end of file |