Merge branch 'release-5.2.1-1.docker'

citusdata · Sep 16, 2016 · 675c26e · 675c26e
2 parents 899e184 + 27ba3c8
commit 675c26e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### citus-docker v5.2.1-1.docker (September 16, 2016) ###
+
+* Preserves ca-certificates package in images to avoid breaking apt-get
+
+* Ensures removal of community GPG key in nightly image build
+
 ### citus-docker v5.2.1 (September 6, 2016) ###
 
 * Bump Citus version to 5.2.1; fixes a subquery bug

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
     && apt-get install -y postgresql-$PG_MAJOR-citus=$CITUS_VERSION \
-    && apt-get purge -y --auto-remove ca-certificates curl \
+    && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*
 
 # add citus to default PostgreSQL config

diff --git a/nightly/Dockerfile b/nightly/Dockerfile
@@ -2,12 +2,13 @@ FROM citusdata/citus:latest
 MAINTAINER Citus Data https://citusdata.com
 
 # switch to Citus nightly
-RUN rm -rf /etc/apt/sources.list.d/citusdata_community.list \
+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 \
     && apt-get install --only-upgrade -y postgresql-$PG_MAJOR-citus \
-    && apt-get purge -y --auto-remove ca-certificates curl \
+    && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*