Skip to content

Environment and permission fixes #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexjustesen merged 9 commits into from
Oct 21, 2022
Merged

Environment and permission fixes #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
139cc43
removed pgsql from sail dev env
alexjustesen Oct 20, 2022
73cf876
use database as session driver
alexjustesen Oct 20, 2022
a58d5d4
use the base .env file when creating the image
alexjustesen Oct 21, 2022
e8352d7
what we all came here for, working files
alexjustesen Oct 21, 2022
e356bbd
added /config to allowed php paths
alexjustesen Oct 21, 2022
fced479
copy config.yml
alexjustesen Oct 21, 2022
7d59c87
updated composer dependencies while we're here
alexjustesen Oct 21, 2022
bd304c9
added a couple more files to .dockerignore
alexjustesen Oct 21, 2022
86f8130
optimize cache dont clear on app:install
alexjustesen Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.git
/.github
/.idea
/.vscode
/docker/8.1
Expand All @@ -10,6 +11,7 @@
/storage/logs
/vendor
_ide_helper.php
.editorconfig
.env
.env.backup
.phpstorm.meta.php
Expand Down
39 changes: 0 additions & 39 deletions .env.docker
View file
Open in desktop

This file was deleted.

40 changes: 10 additions & 30 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}"
121 changes: 0 additions & 121 deletions .phpstorm.meta.php
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Loading