فهرست منبع

fix database permissions alpine, remove baby

sstidl 1 سال پیش
والد
کامیت
83f7491234
2فایلهای تغییر یافته به همراه7 افزوده شده و 3 حذف شده
  1. 6 2
      docker/entrypoint.sh
  2. 1 1
      frontend/javascript/index.js

+ 6 - 2
docker/entrypoint.sh

@@ -18,9 +18,13 @@ cp /speedtest/favicon.ico /var/www/html/
 
 # Set custom webroot on alpine
 if is_alpine; then
+  echo "ALPINE IMAGE"
   sed -i "s#\"/var/www/localhost/htdocs\"#\"/var/www/html\"#g" /etc/apache2/httpd.conf
+else
+  echo "DEBIAN IMAGE"
 fi
 
+
 # Set up backend side for standlone modes
 if [[ "$MODE" == "standalone" || "$MODE" == "dual" ]]; then
   cp -r /speedtest/backend/ /var/www/html/backend
@@ -85,9 +89,9 @@ if [[ "$TELEMETRY" == "true" && ("$MODE" == "frontend" || "$MODE" == "standalone
 
   mkdir -p /database/
   if is_alpine; then
-    chown apache /database/
+    chown -R apache /database/
   else
-    chown www-data /database/
+    chown -R www-data /database/
   fi
 fi
 

+ 1 - 1
frontend/javascript/index.js

@@ -243,7 +243,7 @@ function startRenderingLoop() {
 
   const buttonTexts = {
     [INITIALIZING]: "Loading...",
-    [READY]: "Let's start baby",
+    [READY]: "Let's start",
     [RUNNING]: "Abort",
     [FINISHED]: "Restart",
   };