exec tinyproxy process and add comments regarding resolv.conf

jay-to-the-dee · Jan 1, 2019 · da558f2 · da558f2
1 parent 1c2a9a8
commit da558f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-apt-get -y install --no-install-recommends apt-transport-https ca-certificates tinyproxy add-apt-key debconf-utils iptables expect
-RUN echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections
+apt-get -y install --no-install-recommends apt-transport-https ca-certificates tinyproxy add-apt-key debconf-utils iptables expect #ifupdown
+RUN echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections #This is a Docker specific thing because it enforces it's own /etc/resolv.conf
 
 #Windscribe instructions
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key FDC247B7

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -41,5 +41,4 @@ windscribe connect ${WINDSCRIBE_COUNTRY}
 # Start tinyproxy HTTP proxy service
 echo "Starting HTTP proxy on host port ${HOST_PORT} (HOST_PORT)..."
 # Wait for tinyproxy daemon (hopefully forever) else docker dies :(
-/usr/sbin/tinyproxy -d
-
+exec /usr/sbin/tinyproxy -d