delete all the alpine

Dockerfile.template

@@ -13,52 +13,18 @@ ENV setupVars /etc/pihole/setupVars.conf
 ENV PIHOLE_INSTALL /tmp/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.arch }}.tar.gz
 
-{% if pihole.os == 'alpine' %}
-# TODO Re-enable upgrade after php5 packages use the latest greatest libressl packages, conflicts are breaking build 2017-11-14
-#RUN apk update && \
-RUN apk upgrade --update && \
-    apk add bind-tools wget curl bash libcap ncurses shadow && \
-    usermod -s bash root && \
-{% else %}
 RUN apt-get update && \
     apt-get install -y wget curl net-tools cron && \
-{% endif %}
     curl -L -s $S6OVERLAY_RELEASE \
         | tar xvzf - -C / && \
     docker-install.sh && \
-{% if pihole.os == 'alpine' %}
-    rm -rf /var/cache/apk/*
-{% else %}
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
-{% endif %}
 
 ENTRYPOINT [ "/init" ]
 
 ADD s6/{{ pihole.os }}-root /
 COPY s6/service /usr/local/bin/service
 
-{% if pihole.os == 'alpine' %}
-# Things installer did and fix alpine+nginx differences
-ENV WEBLOGDIR /var/log/nginx
-ENV PHP_CONFIG '/etc/php5/php-fpm.conf'
-RUN mkdir -p /etc/pihole/ && \
-    mkdir -p /var/www/html/pihole && \
-    mkdir -p /var/www/html/admin/ && \
-    chown nginx:nginx /var/www/html && \
-    touch ${WEBLOGDIR}/access.log ${WEBLOGDIR}/error.log && \
-    chown -R nginx:nginx ${WEBLOGDIR} && \
-    sed -i 's|^user\s*=.*$|user = nginx|' $PHP_CONFIG && \
-    sed -i '/^;pid/ s|^;||' $PHP_CONFIG && \
-    chmod 775 /var/www/html && \
-    touch /var/log/pihole.log && \
-    chmod 644 /var/log/pihole.log && \
-    chown dnsmasq:root /var/log/pihole.log && \
-    sed -i "s/@INT@/eth0/" /etc/dnsmasq.d/01-pihole.conf && \
-    setcap CAP_NET_BIND_SERVICE=+eip `which dnsmasq` && \
-    echo 'Done!'
-COPY s6/timeout /usr/local/bin/timeout
-{% endif %}
-
 # php config start passes special ENVs into
 ENV PHP_ENV_CONFIG '{{ pihole.php_env_config }}'
 ENV PHP_ERROR_LOG '{{ pihole.php_error_log }}'
@@ -66,9 +32,6 @@ COPY ./start.sh /
 COPY ./bash_functions.sh /
 
 # IPv6 disable flag for networks/devices that do not support it
-{% if pihole.os == 'debian' %}
-# not fully supported in debian yet
-{% endif %}
 ENV IPv6 True
 
 EXPOSE 53 53/udp