Optimize docker build with additional layer

mrszhangmmd · Jul 28, 2017 · 0741389 · 0741389
1 parent c8e9c78
commit 0741389
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/dockerfiles/amazonlinux/Dockerfile b/dockerfiles/amazonlinux/Dockerfile
@@ -12,7 +12,9 @@ WORKDIR /root
 
 RUN \
    yum -y -q install git subversion automake autoconf gcc make pcre-devel 1>/dev/null && \
-   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
+   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring
+
+RUN \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \
    ./bootstrap.sh 1>/dev/null && \

diff --git a/dockerfiles/centos/Dockerfile b/dockerfiles/centos/Dockerfile
@@ -12,7 +12,9 @@ WORKDIR /root
 
 RUN \
    yum -y -q install git subversion automake autoconf gcc make pcre-devel 1>/dev/null && \
-   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
+   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring
+
+RUN \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \
    ./bootstrap.sh 1>/dev/null && \

diff --git a/dockerfiles/debian/Dockerfile b/dockerfiles/debian/Dockerfile
@@ -12,7 +12,9 @@ WORKDIR /root
 
 RUN \
    apt-get -qq update  1>/dev/null && \
-   apt-get -qq --assume-yes install git subversion automake autoconf gcc make pkg-config libpcre3-dev 1>/dev/null && \
+   apt-get -qq --assume-yes install git subversion automake autoconf gcc make pkg-config libpcre3-dev 1>/dev/null
+
+RUN \
    git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \

diff --git a/dockerfiles/fedora/Dockerfile b/dockerfiles/fedora/Dockerfile
@@ -12,7 +12,9 @@ WORKDIR /root
 
 RUN \
    dnf -y -q install git subversion automake autoconf gcc make pcre-devel 1>/dev/null && \
-   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
+   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring
+
+RUN \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \
    ./bootstrap.sh 1>/dev/null && \

diff --git a/dockerfiles/opensuse/Dockerfile b/dockerfiles/opensuse/Dockerfile
@@ -12,7 +12,9 @@ WORKDIR /root
 
 RUN \
    zypper install --no-confirm --no-recommends git subversion automake autoconf gcc make pkg-config pcre-devel 1>/dev/null && \
-   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
+   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring
+
+RUN \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \
    ./bootstrap.sh 1>/dev/null && \

diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -13,7 +13,9 @@ WORKDIR /root
 RUN \
    apt-get -qq update 1>/dev/null && \
    apt-get -qq --assume-yes install git subversion automake autoconf gcc make pkg-config libpcre3-dev 1>/dev/null && \
-   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring && \
+   git clone -q https://github.com/monitoringartist/zabbix-docker-monitoring
+
+RUN \
    svn --quiet export svn://svn.zabbix.com/${ZABBIX_VERSION} ~/zabbix/ && \
    cd ~/zabbix/ && \
    ./bootstrap.sh 1>/dev/null && \