aboutsummaryrefslogtreecommitdiff
path: root/docker/swift/swift-rsyncd
diff options
context:
space:
mode:
Diffstat (limited to 'docker/swift/swift-rsyncd')
-rw-r--r--docker/swift/swift-rsyncd/Dockerfile.j29
-rwxr-xr-xdocker/swift/swift-rsyncd/start.sh7
2 files changed, 2 insertions, 14 deletions
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index 7fd6b3593..e307e31fd 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -1,21 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum install -y rsync \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends \
- rsync \
+RUN apt-get install -y --no-install-recommends rsync \
&& apt-get clean
{% endif %}
-COPY start.sh /
-
-CMD ["/start.sh"]
-
{{ include_footer }}
diff --git a/docker/swift/swift-rsyncd/start.sh b/docker/swift/swift-rsyncd/start.sh
deleted file mode 100755
index a083e7bac..000000000
--- a/docker/swift/swift-rsyncd/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD