docker image that doesn't contain restricted repos

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index f9c2e6bc5912b9431bc8a39e6a2efb5210e93988..9cf03c0843bce972f707340f666746e91efe7837 100644 (file)
--- 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 20705397b4ea057864c266cf14e11255cfeccec6..eb8e6cedf15e6fc353c2cf5cc8f3485ca28dbd81 100644 (file)
--- 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 0ed8ccb86c98e1a6b53e59f8f8de0523327ce964..5daeb62f597a282d2b32846010cb2c2427b5c004 100755 (executable)
--- 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`