Fixed startup issues when Docker container is put down and up

nesfit · Nov 19, 2023 · 1f3c7c9 · 1f3c7c9
1 parent 8cdf7ab
commit 1f3c7c9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/docker-compose-custom-build.yml b/docker-compose-custom-build.yml
@@ -72,11 +72,11 @@ services:
         # When preserved, the entrypoint will attempt to load existing Fitcrack installation
         # When deleted, the entrypoint installs a new Fitcrack project
 
-        - "mysql:/var/lib/mysql"                           # MySQL server data directory
-        - "collections:/usr/share/collections"             # Collections of dictionaries, masks, etc.
+        - "etc:/etc"                                       # Linux system config directory
+        - "usr:/usr"                                       # Linux system binaries and libraries directory
+        - "run:/run"                                       # Linux system runtime directory
         - "boincadm:/home/boincadm"                        # BOINC server user home directory
-        - "apache:/etc/apache2"                            # Apache config directory
-        - "apache-conf:/etc/init.d"                        # Directory with service init scripts
+        - "mysql:/var/lib/mysql"                           # MySQL server data directory
         - "webadmin-be:/var/www/html/fitcrackAPI"          # Fitcrack backend installation
         - "webadmin-fe:/var/www/html/fitcrackFE"           # Fitcrack frontend installation
         - "./fitcrack-data/logs:/var/log/fitcrack"         # Log directory (host-mapped!)
@@ -90,11 +90,11 @@ services:
         #       using 'docker-compose build' or 'docker-compose build --no-cache'.
 
 volumes:
-  mysql:
+  etc:
+  usr:
+  run:
   boincadm:
-  collections:
-  apache:
-  apache-conf:
+  mysql:
   webadmin-be:
   webadmin-fe:
   logs:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -63,11 +63,11 @@ services:
         # When preserved, the entrypoint will attempt to load existing Fitcrack installation
         # When deleted, the entrypoint installs a new Fitcrack project
 
-        - "mysql:/var/lib/mysql"                           # MySQL server data directory
-        - "collections:/usr/share/collections"             # Collections of dictionaries, masks, etc.
+        - "etc:/etc"                                       # Linux system config directory
+        - "usr:/usr"                                       # Linux system binaries and libraries directory
+        - "run:/run"                                       # Linux system runtime directory
         - "boincadm:/home/boincadm"                        # BOINC server user home directory
-        - "apache:/etc/apache2"                            # Apache config directory
-        - "apache-conf:/etc/init.d"                        # Directory with service init scripts
+        - "mysql:/var/lib/mysql"                           # MySQL server data directory
         - "webadmin-be:/var/www/html/fitcrackAPI"          # Fitcrack backend installation
         - "webadmin-fe:/var/www/html/fitcrackFE"           # Fitcrack frontend installation
         - "./fitcrack-data/logs:/var/log/fitcrack"         # Log directory (host-mapped!)
@@ -81,12 +81,12 @@ services:
         #       using 'docker-compose build' or 'docker-compose build --no-cache'.
 
 volumes:
-  mysql:
+  etc:
+  usr:
+  run:
   boincadm:
-  collections:
-  apache:
-  apache-conf:
+  mysql:
   webadmin-be:
   webadmin-fe:
   logs:
-  certificates:
+  certificates:
diff --git a/tools/entrypoint-fitcrack.sh b/tools/entrypoint-fitcrack.sh
@@ -372,13 +372,24 @@ else # Create Fitcrack project
 
   # Restart Apache
   service apache2 restart
+
+  # All done
+  echo "All done."
+  echo "FITCRACK server is ready to use."
 fi
 
 #
 ##############################################
 
-service mysql start
-service apache2 start
-service fitcrack start
+echo "Fitcrack is already installed in this container."
+echo "Reviving daemons from the past. Please wait..."
+
+service mysql restart
+service apache2 restart
+service fitcrack restart
+
+# All done
+echo "All done."
+echo "FITCRACK server is ready to use."
 
 sleep infinity