diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-23 21:58:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-23 21:58:15 +0000 |
| commit | cfcbb2f4fa903d81ff075622a8d8d0c70302a361 (patch) | |
| tree | 33e502dae02f8fbe05a39a7f4f3e60543ace0e88 /docker | |
| parent | 93d124693b68c2c3976d76e40fd9fbc6d1dcc8b0 (diff) | |
| parent | 72335cae6d42d23d11690e018700078b2eb9dc1a (diff) | |
| download | kolla-cfcbb2f4fa903d81ff075622a8d8d0c70302a361.tar.gz kolla-cfcbb2f4fa903d81ff075622a8d8d0c70302a361.zip | |
Merge "Add base image for oraclelinux"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ol/binary/base/Dockerfile | 12 | ||||
| l--------- | docker/ol/binary/base/build | 1 | ||||
| l--------- | docker/ol/binary/base/kolla-common.sh | 1 | ||||
| l--------- | docker/ol/binary/base/service_hosts.sh | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/docker/ol/binary/base/Dockerfile b/docker/ol/binary/base/Dockerfile new file mode 100644 index 000000000..bdc9f5428 --- /dev/null +++ b/docker/ol/binary/base/Dockerfile @@ -0,0 +1,12 @@ +FROM oraclelinux:7.1 +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum update -y \ + && yum install -y git \ + && yum clean all \ + && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py \ + && rm -f get-pip.py \ + && pip install crudini + +COPY service_hosts.sh kolla-common.sh /opt/kolla/ diff --git a/docker/ol/binary/base/build b/docker/ol/binary/base/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/ol/binary/base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ol/binary/base/kolla-common.sh b/docker/ol/binary/base/kolla-common.sh new file mode 120000 index 000000000..c265c62f7 --- /dev/null +++ b/docker/ol/binary/base/kolla-common.sh @@ -0,0 +1 @@ +../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ol/binary/base/service_hosts.sh b/docker/ol/binary/base/service_hosts.sh new file mode 120000 index 000000000..06e045440 --- /dev/null +++ b/docker/ol/binary/base/service_hosts.sh @@ -0,0 +1 @@ +../../../common/base/service_hosts.sh
\ No newline at end of file |