Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RethinkDB image #7060

Merged
merged 2 commits into from
Dec 4, 2019
Merged

Update RethinkDB image #7060

merged 2 commits into from
Dec 4, 2019

Conversation

gabor-boros
Copy link
Contributor

Hereby we would like to update the official docker image for rethinkdb from 2.3.6 to 2.3.7. Since RethinkDB is back, we will open more PRs in the future.

@tianon
Copy link
Member

tianon commented Dec 3, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index bc08a7e..da624ac 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
 rethinkdb:2
 rethinkdb:2.3
-rethinkdb:2.3.6
+rethinkdb:2.3.7
 rethinkdb:latest
diff --git a/rethinkdb_latest/Dockerfile b/rethinkdb_latest/Dockerfile
index 6ba632c..154930f 100644
--- a/rethinkdb_latest/Dockerfile
+++ b/rethinkdb_latest/Dockerfile
@@ -1,16 +1,16 @@
-FROM debian:jessie
+FROM ubuntu:bionic
 
-MAINTAINER Daniel Alan Miller <dalanmiller@rethinkdb.com>
+RUN apt -qqy update \
+    && apt install -y --no-install-recommends ca-certificates gnupg2 \
+    && rm -rf /var/lib/apt/lists/*
 
-# Add the RethinkDB repository and public key
-# "RethinkDB Packaging <packaging@rethinkdb.com>" http://download.rethinkdb.com/apt/pubkey.gpg
-RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 3B87619DF812A63A8C1005C30742918E5C8DA04A
-RUN echo "deb http://download.rethinkdb.com/apt jessie main" > /etc/apt/sources.list.d/rethinkdb.list
+RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 1D85E93F801BB43F \
+    && echo "deb https://download.rethinkdb.com/apt bionic main" > /etc/apt/sources.list.d/rethinkdb.list
 
-ENV RETHINKDB_PACKAGE_VERSION 2.3.6~0jessie
+ENV RETHINKDB_PACKAGE_VERSION 2.3.7~0bionic
 
-RUN apt-get update \
-	&& apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION \
+RUN apt -qqy update \
+	&& apt install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION \
 	&& rm -rf /var/lib/apt/lists/*
 
 VOLUME ["/data"]

@yosifkit
Copy link
Member

yosifkit commented Dec 3, 2019

apt-key adv should use the full fingerprint, so '539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F'. apt should be apt-get instead (https://askubuntu.com/a/990838).

Everything else looks great. Hopefully the swap from Debian Jessie to Ubuntu Bionic doesn't break anyone, but it is a database and so users shouldn't really be depending on it like in a language stack image.

@gabor-boros
Copy link
Contributor Author

Hello @yosifkit,
Thank you for reviewing the PR. I think the swap from Jessie to Bionic will not hurt anyone, as you mentioned, it is not a language stack. Also, I updated the Dockerfile based on your suggestions.

@yosifkit
Copy link
Member

yosifkit commented Dec 4, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index bc08a7e..da624ac 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
 rethinkdb:2
 rethinkdb:2.3
-rethinkdb:2.3.6
+rethinkdb:2.3.7
 rethinkdb:latest
diff --git a/rethinkdb_latest/Dockerfile b/rethinkdb_latest/Dockerfile
index 6ba632c..7b8e11d 100644
--- a/rethinkdb_latest/Dockerfile
+++ b/rethinkdb_latest/Dockerfile
@@ -1,15 +1,15 @@
-FROM debian:jessie
+FROM ubuntu:bionic
 
-MAINTAINER Daniel Alan Miller <dalanmiller@rethinkdb.com>
+RUN apt-get -qqy update \
+    && apt-get install -y --no-install-recommends ca-certificates gnupg2 \
+    && rm -rf /var/lib/apt/lists/*
 
-# Add the RethinkDB repository and public key
-# "RethinkDB Packaging <packaging@rethinkdb.com>" http://download.rethinkdb.com/apt/pubkey.gpg
-RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 3B87619DF812A63A8C1005C30742918E5C8DA04A
-RUN echo "deb http://download.rethinkdb.com/apt jessie main" > /etc/apt/sources.list.d/rethinkdb.list
+RUN apt-key adv --keyserver keys.gnupg.net --recv-keys "539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F" \
+    && echo "deb https://download.rethinkdb.com/apt bionic main" > /etc/apt/sources.list.d/rethinkdb.list
 
-ENV RETHINKDB_PACKAGE_VERSION 2.3.6~0jessie
+ENV RETHINKDB_PACKAGE_VERSION 2.3.7~0bionic
 
-RUN apt-get update \
+RUN apt-get -qqy update \
 	&& apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION \
 	&& rm -rf /var/lib/apt/lists/*
 

@yosifkit
Copy link
Member

yosifkit commented Dec 4, 2019

Build test of #7060; fd4bdcc; amd64 (rethinkdb):

$ bashbrew build rethinkdb:2.3.7
Building bashbrew/cache:6e3d71f64c324d3195307cad5cef92ef7d3110ef7e5058e362177cc758d7a988 (rethinkdb:2.3.7)
Tagging rethinkdb:2.3.7
Tagging rethinkdb:2.3
Tagging rethinkdb:2
Tagging rethinkdb:latest

$ test/run.sh rethinkdb:2.3.7
testing rethinkdb:2.3.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 75a517d into docker-library:master Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants