Upgrade to ubuntu:18.04

Author: dashohoxha

Dockerfile

@@ -1,24 +1,21 @@
-FROM ubuntu:16.04
-ENV container docker
-# Don't start any optional services except for the few we need.
-RUN find /etc/systemd/system \
-         /lib/systemd/system \
-         -path '*.wants/*' \
-         -not -name '*journald*' \
-         -not -name '*systemd-tmpfiles*' \
-         -not -name '*systemd-user-sessions*' \
-         -exec rm \{} \;
-RUN systemctl set-default multi-user.target
+FROM ubuntu:18.04
+
+### install systemd
+RUN apt update && \
+    apt -y upgrade && \
+    apt -y install systemd && \
+    systemctl set-default multi-user.target
+
 CMD ["/sbin/init"]
+WORKDIR /host
+
+RUN apt-get -y install rsyslog logrotate ssmtp logwatch cron
 
-RUN apt-get update; apt-get -y upgrade
-RUN apt-get -y install \
-        rsyslog logrotate ssmtp logwatch \
-        cron apache2 wget vim openssh-server net-tools
+RUN apt-get -y install apache2 wget openssh-server net-tools
 
 ### install certbot (for getting ssl certs with letsencrypt)
-RUN wget https://dl.eff.org/certbot-auto; \
-    chmod +x certbot-auto ; \
-    mv certbot-auto /usr/local/bin/certbot ; \
-    certbot --os-packages-only --non-interactive ; \
+RUN wget https://dl.eff.org/certbot-auto && \
+    chmod +x certbot-auto && \
+    mv certbot-auto /usr/local/bin/certbot && \
+    certbot --os-packages-only --non-interactive && \
     certbot --version

README.md

@@ -22,19 +22,10 @@ Installation
 
  + Init a container directory for wsproxy: `ds init wsproxy @wsproxy`
 
- + Initialize and fix the settings:
-   ```
-   cd /var/ds/wsproxy/
-   vim settings.sh
-   ds info
-   ```
+ + Initialize and fix the settings: `cd /var/ds/wsproxy/; vim settings.sh`
+
+ + Build image, create the container and configure it: `ds make`
 
- + Build image, create the container and configure it:
-   ```
-   ds build
-   ds create
-   ds config
-   ```
 
 Usage
 -----

settings.sh

@@ -6,8 +6,8 @@ CONTAINER=wsproxy
 PORT_SSH=2222    ## ssh port is needed for websites that are accessed through ssh-tunnels
 PORTS="80:80 443:443 $PORT_SSH:22"
 
-### Gmail account for server notifications (through ssmtp).
-### Make sure to enable less-secure-apps:
-### https://support.google.com/accounts/answer/6010255?hl=en
+### Gmail account for notifications. This will be used by ssmtp.
+### You need to create an application specific password for your account:
+### https://www.lifewire.com/get-a-password-to-access-gmail-by-pop-imap-2-1171882
 GMAIL_ADDRESS=
 GMAIL_PASSWD=