Merge pull request #335 from camilb/2.4

Fix config for version 2.4

Author: djdefi

Dockerfile

@@ -6,7 +6,7 @@ CMD ["/sbin/entrypoint.sh"]
 ARG cachet_ver
 ARG archive_url
 
-ENV cachet_ver ${cachet_ver:-master}
+ENV cachet_ver ${cachet_ver:-2.4}
 ENV archive_url ${archive_url:-https://github.com/cachethq/Cachet/archive/${cachet_ver}.tar.gz}
 
 ENV COMPOSER_VERSION 1.6.3

docker-compose.yml

@@ -13,7 +13,7 @@ services:
     build:
       context: .
       args:
-        - cachet_ver=master
+        - cachet_ver=2.4
     ports:
       - 80:8000
     links:

entrypoint.sh

@@ -104,7 +104,7 @@ initialize_system() {
   CACHE_DRIVER=${CACHE_DRIVER:-apc}
 
   SESSION_DRIVER=${SESSION_DRIVER:-}
-  SESSION_DOMAIN=${SESSION_DOMAIN:-$APP_URL}
+  SESSION_DOMAIN=${SESSION_DOMAIN:-}
   SESSION_SECURE_COOKIE=${SESSION_SECURE_COOKIE:-}
 
   QUEUE_DRIVER=${QUEUE_DRIVER:-database}
@@ -188,8 +188,8 @@ initialize_system() {
   sed 's,{{TRUSTED_PROXIES}},'"${TRUSTED_PROXIES}"',g' -i /var/www/html/.env
 
   if [[ -z "${APP_KEY}" || "${APP_KEY}" = "null" ]]; then
-    keygen="$(php artisan key:generate)"
-    APP_KEY=$(echo "${keygen}" | grep -oP '(?<=\[).*(?=\])')
+    keygen="$(php artisan key:generate --show)"
+    APP_KEY=$(echo "${keygen}")
     echo "ERROR: Please set the 'APP_KEY=${APP_KEY}' environment variable at runtime or in docker-compose.yml and re-launch"
     exit 0
   fi
@@ -204,7 +204,7 @@ initialize_system() {
 
 init_db() {
   echo "Initializing Cachet database ..."
-  php artisan app:install
+  php artisan cachet:install --no-interaction
   check_configured
 }