Merge pull request #1 from alexjustesen/config-with-yml

Config with yml

.dockerignore

@@ -4,6 +4,7 @@
 /public/storage
 /storage/*.key
 /vendor
+config.yml
 .env
 .env.backup
 .phpunit.result.cache

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Everything needs to be reviewed by Alex
+*   @alexjustesen

.gitignore

@@ -4,6 +4,7 @@
 /public/storage
 /storage/*.key
 /vendor
+config.yml
 .env
 .env.backup
 .phpunit.result.cache

Dockerfile

@@ -3,33 +3,33 @@ FROM serversideup/php:8.1-fpm-nginx
 # Install addition packages
 RUN apt-get update && apt-get install -y \
     cron \
-    supervisor \
     php8.1-bcmath \
     php8.1-pgsql \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
-    && rm -f /etc/cont-init.d/50-laravel-automations
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # Install Speedtest cli
 RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \
     && apt-get install -y speedtest
 
 # Copy package configs
 COPY docker/deploy/cron/scheduler /etc/cron.d/scheduler
-COPY docker/deploy/entrypoint /usr/local/bin/entrypoint
-COPY docker/deploy/etc/cont-init.d/ /etc/cont-init.d/
-COPY docker/deploy/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-RUN chmod 0644 /etc/cron.d/scheduler \
-    && crontab /etc/cron.d/scheduler \
-    && chmod +x /usr/local/bin/entrypoint
+COPY docker/deploy/etc/services.d/ /etc/services.d/
 
 # Copy app
 COPY . /var/www/html
 COPY .env.docker .env
 
 # Install app dependencies
 RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-dev \
-    && chown -R 9999:9999 /var/www/html
+    && mkdir -p /app \
+    && mkdir -p storage/logs \
+    && php artisan optimize:clear \
+    && chown -R webuser:webgroup /var/www/html \
+    && rm -rf /etc/cont-init.d/50-laravel-automations \
+    && chmod 0644 /etc/cron.d/scheduler \
+    && crontab /etc/cron.d/scheduler \
+    && cp docker/deploy/entrypoint.sh /entrypoint \
+    && chmod +x /entrypoint
 
-ENTRYPOINT ["entrypoint"]
+ENTRYPOINT ["/entrypoint"]

README.md

@@ -16,8 +16,8 @@ docker run -itd --name speedtest-tracker \
     -p 8080:80 \
     -e "PHP_POOL_NAME=speedtest-tracker_php" \
     -e "DB_CONNECTION=sqlite" \
-    -e "DB_DATABASE=/appdata/database.sqlite" \
-    -v speedtest-tracker_app:/appdata \
+    -e "DB_DATABASE=/app/database.sqlite" \
+    -v speedtest-tracker_app:/app \
     speedtest-tracker
 ```