From 1cf92be7b2380634f636dffc98c98016271bd6e7 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 11 Jan 2016 11:01:30 +0800 Subject: Share the same image between swift services Get rid of swfit children images by share the same image in the swift account, swift object and swift container services Closes-Bug: #1534476 Change-Id: I929689f93b56396a41b19fda46e4679c4de84ca1 --- docker/swift/swift-account-auditor/Dockerfile.j2 | 13 ------------- docker/swift/swift-account-reaper/Dockerfile.j2 | 13 ------------- docker/swift/swift-account-replicator/Dockerfile.j2 | 13 ------------- docker/swift/swift-account-server/Dockerfile.j2 | 13 ------------- docker/swift/swift-account/Dockerfile.j2 | 13 +++++++++++++ docker/swift/swift-container-auditor/Dockerfile.j2 | 13 ------------- docker/swift/swift-container-replicator/Dockerfile.j2 | 13 ------------- docker/swift/swift-container-server/Dockerfile.j2 | 13 ------------- docker/swift/swift-container-updater/Dockerfile.j2 | 13 ------------- docker/swift/swift-container/Dockerfile.j2 | 13 +++++++++++++ docker/swift/swift-object-auditor/Dockerfile.j2 | 4 ---- docker/swift/swift-object-base/Dockerfile.j2 | 11 ----------- docker/swift/swift-object-expirer/Dockerfile.j2 | 15 --------------- docker/swift/swift-object-replicator/Dockerfile.j2 | 4 ---- docker/swift/swift-object-server/Dockerfile.j2 | 4 ---- docker/swift/swift-object-updater/Dockerfile.j2 | 4 ---- docker/swift/swift-object/Dockerfile.j2 | 13 +++++++++++++ 17 files changed, 39 insertions(+), 146 deletions(-) delete mode 100644 docker/swift/swift-account-auditor/Dockerfile.j2 delete mode 100644 docker/swift/swift-account-reaper/Dockerfile.j2 delete mode 100644 docker/swift/swift-account-replicator/Dockerfile.j2 delete mode 100644 docker/swift/swift-account-server/Dockerfile.j2 create mode 100644 docker/swift/swift-account/Dockerfile.j2 delete mode 100644 docker/swift/swift-container-auditor/Dockerfile.j2 delete mode 100644 docker/swift/swift-container-replicator/Dockerfile.j2 delete mode 100644 docker/swift/swift-container-server/Dockerfile.j2 delete mode 100644 docker/swift/swift-container-updater/Dockerfile.j2 create mode 100644 docker/swift/swift-container/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-auditor/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-base/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-expirer/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-replicator/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-server/Dockerfile.j2 delete mode 100644 docker/swift/swift-object-updater/Dockerfile.j2 create mode 100644 docker/swift/swift-object/Dockerfile.j2 (limited to 'docker') diff --git a/docker/swift/swift-account-auditor/Dockerfile.j2 b/docker/swift/swift-account-auditor/Dockerfile.j2 deleted file mode 100644 index 4ab70ac6f..000000000 --- a/docker/swift/swift-account-auditor/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-account \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-account-reaper/Dockerfile.j2 b/docker/swift/swift-account-reaper/Dockerfile.j2 deleted file mode 100644 index 4ab70ac6f..000000000 --- a/docker/swift/swift-account-reaper/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-account \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-account-replicator/Dockerfile.j2 b/docker/swift/swift-account-replicator/Dockerfile.j2 deleted file mode 100644 index 4ab70ac6f..000000000 --- a/docker/swift/swift-account-replicator/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-account \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 deleted file mode 100644 index 4ab70ac6f..000000000 --- a/docker/swift/swift-account-server/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-account \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 new file mode 100644 index 000000000..4ab70ac6f --- /dev/null +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -0,0 +1,13 @@ +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install openstack-swift-account \ + && yum clean all + + {% endif %} +{% endif %} + +{{ include_footer }} diff --git a/docker/swift/swift-container-auditor/Dockerfile.j2 b/docker/swift/swift-container-auditor/Dockerfile.j2 deleted file mode 100644 index ce7e10f73..000000000 --- a/docker/swift/swift-container-auditor/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-container \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-container-replicator/Dockerfile.j2 b/docker/swift/swift-container-replicator/Dockerfile.j2 deleted file mode 100644 index ce7e10f73..000000000 --- a/docker/swift/swift-container-replicator/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-container \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2 deleted file mode 100644 index ce7e10f73..000000000 --- a/docker/swift/swift-container-server/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-container \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-container-updater/Dockerfile.j2 b/docker/swift/swift-container-updater/Dockerfile.j2 deleted file mode 100644 index ce7e10f73..000000000 --- a/docker/swift/swift-container-updater/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-container \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 new file mode 100644 index 000000000..ce7e10f73 --- /dev/null +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -0,0 +1,13 @@ +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install openstack-swift-container \ + && yum clean all + + {% endif %} +{% endif %} + +{{ include_footer }} diff --git a/docker/swift/swift-object-auditor/Dockerfile.j2 b/docker/swift/swift-object-auditor/Dockerfile.j2 deleted file mode 100644 index a9d2c2438..000000000 --- a/docker/swift/swift-object-auditor/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{{ include_footer }} diff --git a/docker/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2 deleted file mode 100644 index 977274dd7..000000000 --- a/docker/swift/swift-object-base/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openstack-swift-object \ - && yum clean all - - {% endif %} -{% endif %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 deleted file mode 100644 index e44767b34..000000000 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-swift-proxy \ - openstack-swift-container \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} diff --git a/docker/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2 deleted file mode 100644 index a9d2c2438..000000000 --- a/docker/swift/swift-object-replicator/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{{ include_footer }} diff --git a/docker/swift/swift-object-server/Dockerfile.j2 b/docker/swift/swift-object-server/Dockerfile.j2 deleted file mode 100644 index a9d2c2438..000000000 --- a/docker/swift/swift-object-server/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{{ include_footer }} diff --git a/docker/swift/swift-object-updater/Dockerfile.j2 b/docker/swift/swift-object-updater/Dockerfile.j2 deleted file mode 100644 index a9d2c2438..000000000 --- a/docker/swift/swift-object-updater/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{{ include_footer }} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 new file mode 100644 index 000000000..5dc27404f --- /dev/null +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -0,0 +1,13 @@ +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install openstack-swift-object \ + && yum clean all + + {% endif %} +{% endif %} + +{{ include_footer }} -- cgit v1.2.3