Merge pull request #978 from proditis/master

docker related improvements

contrib/Dockerfile-vpn

@@ -25,6 +25,8 @@ RUN set -ex \
     libdbi-perl libdbd-mysql libdbd-mysql-perl supervisor; \
     cd /var/www/echoCTF.RED/${RED_APP}; \
     chmod a+x /usr/local/bin/composer; \
+    touch /sbin/pfctl && chmod +x /sbin/pfctl; \
+    ln -s /var/www/echoCTF.RED/${RED_APP}/yii /usr/local/sbin/backend; \
     git config --global url."https://".insteadOf "git://" ; \
 #    [ -z "${GITHUB_OAUTH_TOKEN}" ] || composer config -g github-oauth.github.com "${GITHUB_OAUTH_TOKEN}"; \
 #    [ -z "${GITHUB_OAUTH_TOKEN}" ] || composer config --global github-protocols https; \

contrib/entrypoint-vpn.sh

@@ -36,5 +36,13 @@ if [ ! -f /etc/openvpn/.configured ]; then
     echo "*** The systems are now configured. ***"
     echo "***************************************"
 fi
-openvpn --dev tun0 --config /etc/openvpn/openvpn_tun0.conf
+while ! mysqlshow -h db > /dev/null 2>&1
+do
+    echo "Failed to connect to [db], waiting 1 second" && sleep 1
+done
+
+echo "Attempting to spin up targets"
+backend target/spin
+
+
 $@

contrib/mysql-init.sql

@@ -1,8 +1,4 @@
 SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci;
-DELIMITER ;;
-IF (SELECT count(*) FROM information_schema.tables WHERE table_schema = 'echoCTF' AND table_name = 'devnull' LIMIT 1)>0 THEN
-  CALL echoCTF.init_mysql();
-  DO memc_servers_behavior_set('MEMCACHED_BEHAVIOR_TCP_NODELAY','1');
-  DO memc_servers_behavior_set('MEMCACHED_BEHAVIOR_NO_BLOCK','1');
-END IF;;
-DELIMITER ;
+CALL echoCTF.init_mysql();
+DO memc_servers_behavior_set('MEMCACHED_BEHAVIOR_TCP_NODELAY','1');
+DO memc_servers_behavior_set('MEMCACHED_BEHAVIOR_NO_BLOCK','1');

contrib/openvpn_tun0.conf

@@ -16,7 +16,7 @@ log-append  /var/log/openvpn/openvpn.log
 proto udp4
 port 1194
 management 127.0.0.1 11195 /etc/openvpn/private/mgmt.pwd
-daemon openvpn
+#daemon openvpn
 #chroot /var/openvpn/chrootjail
 crl-verify /etc/openvpn/crl.pem
 float

contrib/supervisord.conf

@@ -34,3 +34,15 @@ command = tail -3f /var/log/openvpn/openvpn.log
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
+
+[program:IndexPlusInstances]
+user = root
+environment = TERM=vt100
+command = watch -t -n 30 "backend cron/index;backend cron/instances"
+
+[program:openvpn]
+user = root
+command = openvpn --dev tun0 --config /etc/openvpn/openvpn_tun0.conf
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true

docker-compose-novpn-macvlan.yml

@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: contrib/Dockerfile-mariadb
     restart: "always"
-    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake"]
+    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake","--init_file=/always-initdb.d/99_mysql-init.sql"]
     volumes:
       - data-mysql:/var/lib/mysql
     environment:

docker-compose-novpn.yml

@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: contrib/Dockerfile-mariadb
     restart: "always"
-    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake"]
+    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake","--init_file=/always-initdb.d/99_mysql-init.sql"]
 #    ports:
 #      - 3306:3306
 #      - 11211:11211

docker-compose.yml

@@ -2,12 +2,13 @@ version: '2'
 services:
   db:
     container_name: echoctfred_db
+    hostname: db
     image: echothrust/echoctf.red-db
     build:
       context: .
       dockerfile: contrib/Dockerfile-mariadb
     restart: "always"
-    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake"]
+    command: ["mysqld","--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci","--skip-character-set-client-handshake", "--init_file=/always-initdb.d/99_mysql-init.sql"]
 #    ports:
 #      - 3306:3306
 #      - 11211:11211
@@ -24,6 +25,7 @@ services:
 
   backend:
     container_name: echoctfred_backend
+    hostname: backend
     image: echothrust/echoctf.red-backend
     build:
       context: .
@@ -50,6 +52,7 @@ services:
 
   frontend:
     container_name: echoctfred_frontend
+    hostname: frontend
     image: echothrust/echoctf.red-frontend
     build:
       context: .
@@ -77,6 +80,7 @@ services:
 
   vpn:
     container_name: echoctfred_vpn
+    hostname: vpn
     cap_add:
       - NET_ADMIN
     privileged: true