From 215d0322ffcbf3b1d091a0bb3d76692504b87280 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:06:40 -0500
Subject: [PATCH] Moved starting services to inside dockerfile; side-benefit of
 faster startups

---
 Dockerfile             | 8 +++++++-
 entrypoint.sh          | 9 ---------
 scripts/mysql_setup.sh | 1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7baea3c..6d746c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default
 
+# Start services
+RUN service mysql start \
+    && service php7.2-fpm start
+
 # Copying in nginx configuration
 COPY /etc/ /etc/
 
+# Copying in scripts and making them executable
 COPY /scripts/ /scripts/
 RUN chmod -R +x /scripts/
 
@@ -25,8 +30,9 @@ RUN /scripts/mysql_setup.sh
 # Copying in startup script
 COPY /entrypoint.sh /
 
-# Copying in  web files
+# Copying in  web files and setting default owenership
 COPY /var/www/ /var/www/
+RUN chown -R www-data:www-data /var/www
 
 # Setting up the database tables
 #RUN mysql -u root friendbook < initialization.sql
diff --git a/entrypoint.sh b/entrypoint.sh
index 1653cc1..369ee77 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,13 +1,4 @@
 #!/bin/sh
 
-echo "[ INFO ] Recursively setting www-data:www-data permissions on root web directory"
-chown -R www-data:www-data /var/www
-
-echo "[ INFO ] Starting MySQL Server"
-service mysql start
-
-echo "[ INFO ] Starting PHP 7.2 Service"
-service php7.2-fpm start
-
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground
diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 163cb99..9b65744 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-service mysql start
 
 # Perform the equivalent of running `mysql_secure_installation`
 mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"