From: Andrew Engelbrecht <andrew@fsf.org>
Date: Mon, 15 Oct 2018 20:15:01 +0000 (-0400)
Subject: docker image that doesn't contain restricted repos
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=35ccc9e93438913a7b54a562a2c4ecf72fe475a4;p=discourse_docker.git

docker image that doesn't contain restricted repos
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index f9c2e6b..9cf03c0 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -12,9 +12,9 @@ RUN echo 2.0.`date +%Y%m%d` > /VERSION
 
 RUN apt-get update && apt-get install -y lsb-release sudo curl
 RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections
-RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main restricted universe" > /etc/apt/sources.list
-RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main restricted universe" >> /etc/apt/sources.list
-RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-security main restricted universe" >> /etc/apt/sources.list
+RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe" > /etc/apt/sources.list
+RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main universe" >> /etc/apt/sources.list
+RUN echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-security main universe" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -y install fping
 RUN sh -c "fping proxy && echo 'Acquire { Retries \"0\"; HTTP { Proxy \"http://proxy:3128\";}; };' > /etc/apt/apt.conf.d/40proxy && apt-get update || true"
 RUN apt-get -y install software-properties-common
diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index 2070539..eb8e6ce 100644
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,7 +1,8 @@
 # NAME:     discourse/discourse_test
 # VERSION:  release
 ARG tag=build
-FROM discourse/base:$tag
+#FROM discourse/base:$tag
+FROM discourse/base:build
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
diff --git a/launcher b/launcher
index 0ed8ccb..5daeb62 100755
--- a/launcher
+++ b/launcher
@@ -69,7 +69,8 @@ git_rec_version='1.8.0'
 config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
-image=discourse/base:2.0.20180802
+#image=discourse/base:2.0.20180802
+image=discourse/base:build
 docker_path=`which docker.io || which docker`
 git_path=`which git`