prompt for APP_KEY if not set

Author: djdefi

Diff for: docker-compose.yml

@@ -25,6 +25,7 @@ services:
       - DB_USERNAME=postgres
       - DB_PASSWORD=postgres
       - DB_PREFIX=chq_
+      - APP_KEY=${APP_KEY:-null}
       - DEBUG=true
     depends_on:
       - postgres

Diff for: entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 set -eo pipefail
 
-[[ $DEBUG == true ]] && set -x
+[[ "${DEBUG}" == true ]] && set -x
 
 check_database_connection() {
   echo "Attempting to connect to database ..."
-  case ${DB_DRIVER} in
+  case "${DB_DRIVER}" in
     mysql)
       prog="mysqladmin -h ${DB_HOST} -u ${DB_USERNAME} ${DB_PASSWORD:+-p$DB_PASSWORD} status"
       ;;
@@ -18,7 +18,7 @@ check_database_connection() {
   while ! ${prog} >/dev/null 2>&1
   do
     timeout=$(( $timeout - 1 ))
-    if [[ $timeout -eq 0 ]]; then
+    if [[ "$timeout" -eq 0 ]]; then
       echo
       echo "Could not connect to database server! Aborting..."
       exit 1
@@ -31,9 +31,9 @@ check_database_connection() {
 
 checkdbinitmysql() {
     table=sessions
-    if [ "$(mysql -N -s -h ${DB_HOST} -u ${DB_USERNAME} ${DB_PASSWORD:+-p$DB_PASSWORD} ${DB_DATABASE} -e \
+    if [[ "$(mysql -N -s -h ${DB_HOST} -u ${DB_USERNAME} ${DB_PASSWORD:+-p$DB_PASSWORD} ${DB_DATABASE} -e \
         "select count(*) from information_schema.tables where \
-            table_schema='${DB_DATABASE}' and table_name='${DB_PREFIX}${table}';")" -eq 1 ]; then
+            table_schema='${DB_DATABASE}' and table_name='${DB_PREFIX}${table}';")" -eq 1 ]]; then
         echo "Table ${DB_PREFIX}${table} exists! ..."
     else
         echo "Table ${DB_PREFIX}${table} does not exist! ..."
@@ -45,7 +45,7 @@ checkdbinitmysql() {
 checkdbinitpsql() {
     table=sessions
     export PGPASSWORD=${DB_PASSWORD}
-    if [ "$(psql -h ${DB_HOST} -U ${DB_USERNAME} -d ${DB_DATABASE} -c "SELECT to_regclass('${DB_PREFIX}${table}');" | grep -c "${DB_PREFIX}${table}")" -eq 1 ]; then
+    if [[ "$(psql -h ${DB_HOST} -U ${DB_USERNAME} -d ${DB_DATABASE} -c "SELECT to_regclass('${DB_PREFIX}${table}');" | grep -c "${DB_PREFIX}${table}")" -eq 1 ]]; then
         echo "Table ${DB_PREFIX}${table} exists! ..."
     else
         echo "Table ${DB_PREFIX}${table} does not exist! ..."
@@ -55,7 +55,7 @@ checkdbinitpsql() {
 }
 
 check_configured() {
-  case ${DB_DRIVER} in
+  case "${DB_DRIVER}" in
     mysql)
       checkdbinitmysql
       ;;
@@ -68,6 +68,7 @@ check_configured() {
 initialize_system() {
   echo "Initializing Cachet container ..."
 
+  APP_KEY=${APP_KEY:-null}
   APP_ENV=${APP_ENV:-development}
   APP_DEBUG=${APP_DEBUG:-true}
   APP_URL=${APP_URL:-http://localhost}
@@ -79,11 +80,11 @@ initialize_system() {
   DB_USERNAME=${DB_USERNAME:-postgres}
   DB_PASSWORD=${DB_PASSWORD:-postgres}
 
-  if [ ${DB_DRIVER} = "pgsql" ]; then
+  if [[ "${DB_DRIVER}" = "pgsql" ]]; then
     DB_PORT=${DB_PORT:-5432}
   fi
 
-  if [ ${DB_DRIVER} = "mysql" ]; then
+  if [[ "${DB_DRIVER}" = "mysql" ]]; then
     DB_PORT=${DB_PORT:-3306}
   fi
 
@@ -119,10 +120,15 @@ initialize_system() {
   PHP_MAX_CHILDREN=${PHP_MAX_CHILDREN:-5}
 
   # configure env file
-  keygen="$(sudo php artisan key:generate)"
-  echo ${keygen}
-  appkey=$(echo ${keygen} | grep -oP '(?<=\[).*(?=\])')
-  sed 's,{{APP_KEY}},'${appkey}',g' -i /var/www/html/.env
+  if [[ "${APP_KEY}" == null ]]; then
+    keygen="$(sudo php artisan key:generate)"
+    echo "${keygen}"
+    appkey=$(echo ${keygen} | grep -oP '(?<=\[).*(?=\])')
+    echo "Please set ${appkey} as your APP_KEY variable in the environment or docker-compose.yml and re-launch"
+    exit 1
+  fi
+
+  sed 's,{{APP_KEY}},'${APP_KEY}',g' -i /var/www/html/.env
 
   sed 's,{{APP_ENV}},'"${APP_ENV}"',g' -i /var/www/html/.env
   sed 's,{{APP_DEBUG}},'"${APP_DEBUG}"',g' -i /var/www/html/.env

Diff for: test/test.full.bats

@@ -4,6 +4,8 @@ load docker_helpers
 load "lib/batslib"
 load "lib/output"
 
+export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
+
 @test "[$TEST_FILE] testing Cachet Docker image build" {
   command docker-compose build --no-cache cachet
 }

Diff for: test/test.mysql.bats

@@ -4,6 +4,8 @@ load docker_helpers
 load "lib/batslib"
 load "lib/output"
 
+export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
+
 @test "[$TEST_FILE] docker-compose up" {
   command docker-compose -f test/docker-compose-mysql.yml up -d
 }