From 2e76c1e570982d2bfe95ea65af60003b36e55f47 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Mon, 31 Oct 2016 15:28:43 -0700 Subject: [PATCH] fixes to make Dockerfile work with latest phusion/baseimage --- tests/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Dockerfile b/tests/Dockerfile index f2b040a..19bbfd9 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -10,7 +10,9 @@ RUN apt-get update && apt-get --auto-remove -y dist-upgrade # Add the RethinkDB repository and public key # "RethinkDB Packaging " http://download.rethinkdb.com/apt/pubkey.gpg RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399 \ - && echo "deb http://download.rethinkdb.com/apt trusty main" > /etc/apt/sources.list.d/rethinkdb.list \ + && . /etc/lsb-release \ + && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" \ + > /etc/apt/sources.list.d/rethinkdb.list \ && apt-get update && apt-get -y install rethinkdb RUN mkdir -vp /etc/service/rethinkdb \ @@ -18,4 +20,4 @@ RUN mkdir -vp /etc/service/rethinkdb \ && chmod a+x /etc/service/rethinkdb/run RUN apt-get -y install python-virtualenv git -RUN apt-get -y install python-gdbm python3-gdbm libpython2.7-dev libpython3.4-dev libffi-dev libssl-dev +RUN apt-get -y install python-gdbm python3-gdbm libpython2.7-dev libpython3-dev libffi-dev libssl-dev