From 60db5f060e8642202880a180e2ae1bf6cc271aa0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 Aug 2016 01:27:26 +0200 Subject: [PATCH] Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update [Carry 24314] Make MongoDB sample Dockerfile working again (cherry picked from commit 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad) Signed-off-by: Tibor Vass --- docs/examples/mongodb/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/examples/mongodb/Dockerfile b/docs/examples/mongodb/Dockerfile index 3513da4716..aea59c155f 100644 --- a/docs/examples/mongodb/Dockerfile +++ b/docs/examples/mongodb/Dockerfile @@ -1,14 +1,15 @@ # Dockerizing MongoDB: Dockerfile for building MongoDB images -# Based on ubuntu:latest, installs MongoDB following the instructions from: +# Based on ubuntu:16.04, installs MongoDB following the instructions from: # http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ -FROM ubuntu:latest +FROM ubuntu:16.04 MAINTAINER Docker # Installation: # Import MongoDB public GPG key AND create a MongoDB list file -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 -RUN echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 +RUN echo "deb http://repo.mongodb.org/apt/ubuntu $(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d= -f2)/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list + # Update apt-get sources AND install MongoDB RUN apt-get update && apt-get install -y mongodb-org