chore: exclude .env file from prod build

.dockerignore

@@ -1,12 +1,16 @@
-# Exclude everything we won't need for a production build
-# NOTE: These will get volumed during development but excluded in production
+# Exclude everything we won't need for a production build.
+# NOTE: These will be volumed during development but excluded in production 
+# unless explicitly put there by the build process.
 **/.DS_Store
-**/.env-example
+**/.editorconfig
+**/.env*
 **/.gitattributes
 **/.gitignore
+**/.styleci.yml
+**/*.md
+**/*.xml
 **/bin
 **/node_modules
-**/*.xml
-**/*.md
+**/phpstan.neon
 **/tests
 **/vendor

Dockerfile

@@ -8,13 +8,13 @@ RUN if [ ! -z "$PROD" ]; then \
     # Setup prod env
     composer install -q --no-ansi --no-interaction --no-scripts --no-plugins --no-progress --prefer-dist --optimize-autoloader --no-dev \
     && npm install -s --omit=dev \
-    && npm run build \
-    && php artisan optimize; \
+    && npm run build; \
     # Setup dev env
     else \
     composer install \
-    && npm install \
-    && php artisan optimize:clear; \
+    && npm install; \
     fi \
     # Setup shared env
     && php artisan storage:link
+
+CMD sh -c "$(if [ ! -z "$PROD" ]; then php artisan optimize; else php artisan optimize:clear; fi)"

docker-compose-prod.yml

@@ -16,7 +16,6 @@ services:
     labels:
       - 'traefik.http.routers.glass.rule=Host(`blog.justinpaulhammond.com`) || Host(`www.blog.justinpaulhammond.com`)'
       - 'traefik.http.routers.glass.tls=true'
-      - 'traefik.http.routers.glass.tls.certresolver=letsencrypt'
     depends_on:
       glass-db:
         condition: service_healthy

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       - traefik
       - glass
     labels:
-      - traefik.enable=true
+      - 'traefik.enable=true'
       - 'traefik.docker.network=traefik'
     env_file:
       - src/.env