Changed image from php:apache to ubuntu

build/Dockerfile

@@ -1,27 +1,34 @@
-FROM php:7.2-apache
+FROM ubuntu:latest
 MAINTAINER ex0nuss
 
+## for apt to be noninteractive
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
+#--no-install-recommends
 RUN apt-get -y update && \
-    apt install -y --no-install-recommends \
+    apt install -y  \
+    apache2 \
+    php \
+    libapache2-mod-php \
+    libcurl4-gnutls-dev \
     iputils-ping \
     wakeonlan \
     git
-#RUN docker-php-ext-install curl
 
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+WORKDIR /root
-RUN chmod u+s `which ping`
+RUN git clone https://github.com/sciguy14/Remote-Wake-Sleep-On-LAN-Server.git &&\
-RUN git clone https://github.com/sciguy14/Remote-Wake-Sleep-On-LAN-Server.git
+    chown root: /var/www/html &&\
+    chmod u+s `which ping`
 
-WORKDIR /var/www/html
+COPY ports.conf /etc/apache2/
 
 RUN a2enmod headers &&\
     service apache2 restart
 
-RUN mv -f Remote-Wake-Sleep-On-LAN-Server/000-default.conf /etc/apache2/sites-available/000-default.conf
+RUN mv -f Remote-Wake-Sleep-On-LAN-Server/000-default.conf /etc/apache2/sites-available/000-default.conf &&\
-COPY ports.conf /etc/apache2/
+    sed -i.bak "s/expose_php = On/expose_php = Off/g" /etc/php/7.4/apache2/php.ini &&\
-
+    sed -i.bak "s/E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED/error_reporting = E_ERROR/g" /etc/php/7.4/apache2/php.ini &&\
-RUN sed -i.bak "s/expose_php = On/expose_php = Off/g" $PHP_INI_DIR/php.ini &&\
-    sed -i.bak "s/E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED/error_reporting = E_ERROR/g" $PHP_INI_DIR/php.ini &&\
     sed -i.bak "s/ServerSignature On/ServerSignature Off/g" /etc/apache2/conf-available/security.conf &&\
     sed -i.bak "s/ServerTokens OS/ServerTokens Prod/g" /etc/apache2/conf-available/security.conf &&\
     service apache2 restart
@@ -30,7 +37,6 @@ RUN mv Remote-Wake-Sleep-On-LAN-Server/* /var/www/html &&\
     mv Remote-Wake-Sleep-On-LAN-Server/.htaccess /var/www/html &&\
     rm -rf Remote-Wake-Sleep-On-LAN-Server/ &&\
     rm -f /var/www/html/index.html
-#    mv /var/www/html/config_sample.php /var/www/html/config.php
 
 COPY config.php /var/www/html/config.php
 COPY entrypoint.sh /
@@ -38,7 +44,7 @@ COPY entrypoint.sh /
 ENV APACHE2_PORT=80
 ENV PASSPHRASE=
 ENV RWSOLS_MAX_PINGS=15
-ENV RWSOL_SLEEP_TIME=5
+ENV RWSOLS_SLEEP_TIME=5
 ENV RWSOLS_COMPUTER_NAME=
 ENV RWSOLS_COMPUTER_MAC=
 ENV RWSOLS_COMPUTER_IP=

build/config.php

@@ -20,7 +20,7 @@
 	// This is the number of times that the WOL server will try to ping the target computer to check if it has woken up. Default = 15.
 	$MAX_PINGS = REPLACE_RWSOLS_MAX_PINGS;
 	// This is the number of seconds to wait between pings commands when waking up or sleeping. Waking from shutdown or sleep will impact this.
-	$SLEEP_TIME = REPLACE_RWSOL_SLEEP_TIME;
+	$SLEEP_TIME = REPLACE_RWSOLS_SLEEP_TIME;
 
 	// This is the Name of the computers to appear in the drop down
 	$COMPUTER_NAME = array(REPLACE_RWSOLS_COMPUTER_NAME);

build/entrypoint.sh

@@ -24,16 +24,10 @@ search_and_replace RWSOLS_HASH $RWSOLS_HASH
 
 
 #APACHE2 port mapping
-echo "search_and_replace port 80 with $APACHE2_PORT"
+echo "search_and_replace port 8080 with $APACHE2_PORT"
-sed -i 's|'80'|'$APACHE2_PORT'|g' '/etc/apache2/ports.conf'
+sed -i 's|'8080'|'$APACHE2_PORT'|g' '/etc/apache2/ports.conf'
 
 
 #Starting apache2
-service apache2 reload
+echo "Starting Apache2: /usr/sbin/apache2ctl -D FOREGROUND"
-exec apache2-foreground
+/usr/sbin/apache2ctl -D FOREGROUND
-
-
-#TODO
-# 1. PHP-Arrays mit env vars testen: z.B. RWSOLS_COMPUTER_NAME="PcTest","PcTest1"
-# 2. Für alle Config-Settings Env vars erstellen
-# 3. Hash for Keyphrase erstellen

build/ports.conf

@@ -2,7 +2,7 @@
 # have to change the VirtualHost statement in
 # /etc/apache2/sites-enabled/000-default.conf
 
-Listen 80
+Listen 8080
 
 <IfModule ssl_module>
 	Listen 443

config.php

@@ -0,0 +1,50 @@
+<?php
+	/*
+	Remote Wake/Sleep-On-LAN Server [CONFIGURATION FILE]
+	https://github.com/sciguy14/Remote-Wake-Sleep-On-LAN-Server
+	Original Author: Jeremy E. Blum (http://www.jeremyblum.com)
+	Security Edits By: Felix Ryan (https://www.felixrr.pro)
+	License: GPL v3 (http://www.gnu.org/licenses/gpl.html)
+
+	UPDATE THE VALUES IN THIS FILE AND CHANGE THE NAME TO: "config.php"
+	*/
+
+	// Set the below to "true" (no quotes) to enforce HTTPS connections (don't forget to create a self-signed cert and enable it in Apache2)
+	$USE_HTTPS = false;
+
+	// Choose a passphrase and find the sha256 hash of that passphrase.
+	// You can use an online calculator to generate the hash: http://www.xorbin.com/tools/sha256-hash-calculator.
+	// Unless you are using an SSL connection to your server, remember that passphrases can still be obtained via a man-in-the-middle attack.
+	$APPROVED_HASH = "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
+
+	// This is the number of times that the WOL server will try to ping the target computer to check if it has woken up. Default = 15.
+	$MAX_PINGS = 15;
+	// This is the number of seconds to wait between pings commands when waking up or sleeping. Waking from shutdown or sleep will impact this.
+	$SLEEP_TIME = 5;
+
+	// This is the Name of the computers to appear in the drop down
+	$COMPUTER_NAME = array("Pc1","NAS");
+
+	// This is the MAC address of the Network Interface on the computer you are trying to wake.
+	$COMPUTER_MAC = array("54:04:A6:3C:B2:D5","AA:AA:AA");
+
+	// This is the LOCAL IP address of the computer you are trying to wake.  Use a reserved DHCP through your router's administration interface to ensure it doesn't change.
+	$COMPUTER_LOCAL_IP = array("192.168.178.45","192.168.178.100");
+
+	// This is the Port being used by the Windows SleepOnLan Utility to initiate a Sleep State
+	// http://www.ireksoftware.com/SleepOnLan/
+	// Alternate Download Link: http://www.jeremyblum.com/wp-content/uploads/2013/07/SleepOnLan.zip
+	$COMPUTER_SLEEP_CMD_PORT = 7760;
+
+	// Command to be issued by the windows sleeponlan utility
+	// options are suspend, hibernate, logoff, poweroff, forcepoweroff, lock, reboot
+	// You can create a windows scheduled task that starts sleeponlan.exe on boot with following startup parameters /auto /port=7760
+	$COMPUTER_SLEEP_CMD = "suspend";
+
+	// This is the location of the bootstrap style folder relative to your index and config file. Default = "" (Same folder as this file)
+	// Directory must be called "bootstrap". You may wish to move if this WOL script is the "child" of a larger web project on your Pi, that will also use bootstrap styling.
+	// If if it on directory up, for example, you would set this to "../"
+	// Two directories up? Set too "../../"
+	// etc...
+	$BOOTSTRAP_LOCATION_PREFIX = "";
+?>

docker-compose.yml

@@ -7,18 +7,12 @@ services:
     container_name: development-rwsols
 #    restart: unless-stopped
     network_mode: host
-#    ports:
-#      - 9999:81
-#    volumes:
-#      - 
     environment:
-      - APACHE2_PORT=81
+      - APACHE2_PORT=9898
-      - PASSPHRASE=Test
+      - PASSPHRASE=MyPassword
-      - RWSOLS_COMPUTER_NAME="HansPc","OMV-nas"
+      - RWSOLS_COMPUTER_NAME="Pc1","Pc2"
-      - RWSOLS_COMPUTER_MAC="54:04:A6:3C:B2:D5","AA:AA:AA"
+      - RWSOLS_COMPUTER_MAC="XX:XX:XX:XX:XX:XX","XX:XX:XX:XX:XX:XX"
-      - RWSOLS_COMPUTER_IP="192.168.178.45","192.168.178.100"
+      - RWSOLS_COMPUTER_IP="192.168.1.45","192.168.1.50"
-    labels:
-      - com.centurylinklabs.watchtower.enable=false
 
 ### ENV-file presets ###
 # Europe/Berlin

docker-compose.yml.save

@@ -1,22 +0,0 @@
-RWSOLS_COMPUTER_IPversion: "3"
-
-services:
-  development-rwsols:
-    build: ./build
-#    image: ex0nuss/plex-export-docker
-    container_name: development-rwsols
-#    restart: unless-stopped
-    ports:
-      - 9999:80
-#    volumes:
-#      - 
-    environment:
-      - RWSOLS_COMPUTER_NAME=PcTest
-      - RWSOLS_COMPUTER_MAC=FF:FF:32:FF
-      - RWSOLS_IP=192.168.178.1
-    labels:
-      - com.centurylinklabs.watchtower.enable=false
-
-### ENV-file presets ###
-# Europe/Berlin
-# 996