From 5d5ef97875618dc43bcd0e42af829457484f5617 Mon Sep 17 00:00:00 2001
From: gindibay <gurkanindibay@gmail.com>
Date: Fri, 24 Sep 2021 16:46:10 +0300
Subject: [PATCH] Seperates prerequisite steps from citus install

---
 Dockerfile             |  8 +++++---
 nightly/Dockerfile     | 10 ++++++----
 postgres-12/Dockerfile |  8 +++++---
 postgres-14/Dockerfile |  6 ++++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91355c0..86c1482 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,14 @@ LABEL maintainer="Citus Data https://citusdata.com" \
 
 ENV CITUS_VERSION ${VERSION}.citus-1
 
-# install Citus
+# install Citus dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
-       curl \
-    && curl -s https://install.citusdata.com/community/deb.sh | bash \
+       curl
+
+# install Citus
+RUN curl -s https://install.citusdata.com/community/deb.sh | bash \
     && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
                           postgresql-$PG_MAJOR-hll=2.15.citus-1 \
                           postgresql-$PG_MAJOR-topn=2.3.1 \
diff --git a/nightly/Dockerfile b/nightly/Dockerfile
index 47cce8e..7e209bc 100644
--- a/nightly/Dockerfile
+++ b/nightly/Dockerfile
@@ -8,14 +8,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.version="Nightly" \
       org.label-schema.schema-version="1.0"
 
-# switch to Citus nightly
+# Perform pre requisites for Citus Nightly Installation
 RUN apt-key del 1530DF18 \
     && rm -rf /etc/apt/sources.list.d/citusdata_community.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
-       curl \
-    && curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \
+       curl
+
+# Install Citus nightly
+RUN curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \
     && apt-get install -y postgresql-$PG_MAJOR-citus \
     && apt-get purge -y --auto-remove curl \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile
index 1c7ca70..73f0c27 100644
--- a/postgres-12/Dockerfile
+++ b/postgres-12/Dockerfile
@@ -13,12 +13,14 @@ LABEL maintainer="Citus Data https://citusdata.com" \
 
 ENV CITUS_VERSION ${VERSION}.citus-1
 
-# install Citus
+# install Citus dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
-       curl \
-    && curl -s https://install.citusdata.com/community/deb.sh | bash \
+       curl
+
+# install Citus
+RUN curl -s https://install.citusdata.com/community/deb.sh | bash \
     && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
                           postgresql-$PG_MAJOR-hll=2.15.citus-1 \
                           postgresql-$PG_MAJOR-topn=2.3.1 \
diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile
index 9ce0f4c..e533913 100644
--- a/postgres-14/Dockerfile
+++ b/postgres-14/Dockerfile
@@ -19,12 +19,14 @@ RUN apt-get update && apt-get install -y lsb-release apt-utils wget curl gnupg2
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*
 
-# install Citus
+# install Citus dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
        curl \
-    && curl -s https://install.citusdata.com/community/deb.sh |  bash \
+
+# install Citus
+RUN curl -s https://install.citusdata.com/community/deb.sh |  bash \
     &&  apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*