Merge "Share the same image between swift services"

14 files changed, 2 insertions, 109 deletions

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-auditor/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 4ab70ac6f..4ab70ac6f 100644
--- a/docker/swift/swift-account-auditor/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
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-auditor/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index ce7e10f73..ce7e10f73 100644
--- a/docker/swift/swift-container-auditor/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
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-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-base/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 977274dd7..5dc27404f 100644
--- a/docker/swift/swift-object-base/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -9,3 +9,5 @@ RUN yum -y install openstack-swift-object \
 
     {% endif %}
 {% endif %}
+
+{{ include_footer }}