Environment and permission fixes (alexjustesen#51)

Author: alexjustesen

.dockerignore

@@ -1,4 +1,5 @@
 /.git
+/.github
 /.idea
 /.vscode
 /docker/8.1
@@ -10,6 +11,7 @@
 /storage/logs
 /vendor
 _ide_helper.php
+.editorconfig
 .env
 .env.backup
 .phpstorm.meta.php

.env.docker

@@ -1,33 +1,27 @@
 APP_NAME="Speedtest Tracker"
-APP_ENV=local
+APP_ENV=production
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://localhost
 
-LOG_CHANNEL=stack
+LOG_CHANNEL=stderr
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=speedtest_tracker
-DB_USERNAME=root
-DB_PASSWORD=
+DB_CONNECTION=sqlite
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+# DB_DATABASE=speedtest_tracker
+# DB_USERNAME=root
+# DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 FILESYSTEM_DISK=local
 QUEUE_CONNECTION=database
-SESSION_DRIVER=file
+SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-MEMCACHED_HOST=127.0.0.1
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
 MAIL_MAILER=smtp
 MAIL_HOST=mailhog
 MAIL_PORT=1025
@@ -42,17 +36,3 @@ AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_HOST=
-PUSHER_PORT=443
-PUSHER_SCHEME=https
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.env.example

@@ -1,6 +1,7 @@
 FROM serversideup/php:beta-8.1-fpm-nginx
 
-ENV PHP_POOL_NAME=speedtest-tracker_php
+# Add /config to allowed directory tree
+ENV PHP_OPEN_BASEDIR=$WEBUSER_HOME:/config/:/dev/stdout:/tmp
 
 # Install addition packages
 RUN apt-get update && apt-get install -y \
@@ -18,14 +19,16 @@ RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/scr
 COPY --chmod=644 docker/deploy/cron/scheduler /etc/cron.d/scheduler
 COPY --chmod=755 docker/deploy/etc/s6-overlay/ /etc/s6-overlay/
 
+WORKDIR /var/www/html
+
 # Copy app
 COPY --chown=webuser:webgroup . /var/www/html
-COPY .env.docker .env
 
 # Install app dependencies
 RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-dev \
-    && mkdir -p /app \
     && mkdir -p storage/logs \
     && php artisan optimize:clear \
     && chown -R webuser:webgroup /var/www/html \
     && crontab /etc/cron.d/scheduler
+
+VOLUME /config