ci: fix deployment for railway

NIAEFEUP · Jul 29, 2024 · 67c30e3 · 67c30e3
1 parent 00edc06
commit 67c30e3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 41 deletions.
diff --git a/.env.development b/.env.development
diff --git a/.env.railway.encrypted b/.env.railway.encrypted
@@ -1 +1 @@
-eyJpdiI6IjV3ZmRHa2ZUMDhUbDQ2UVVUc3VkY0E9PSIsInZhbHVlIjoiU0R5MzIzQmpBekFXbTVGb3JRdU9aNGhQZVAxbGZCaEhtNkFUeTlMaDZnNU1ZcEZkU1lwS0dEMENYbzZkeGU0eW93VDN2NytlamVRM1NTTllqUzI3VzBVUWxLVm1pRThxWTdWdTdGZnpYd3hkNk9mMFRXa0JTaUVva1BHbkdCTERndmZDTkdLMWprRURVWUk3R3lKbWQyRTRra3V3WG9YeURWTlpHQ0VpVDZ2aHQxTG5oRFEraEsydkJvalFiWmdFV3NiOHFGSVN5V1QyQVhOZzRRa1FDUGZSZXg3ZS9HRURUeVJzM2ZPQkNuNDZscXdtZmtUQkxXUWNYT3BsVFZzenMzamdWOHZpMWlwMWlzSDRtLytBUHdYN25OL2Y1M1dIU1lzWko5VlFPV0paYlJQekRVMWZzK0NJZ3hnNXVHREtseFBNc2ZWZWpKeU9JY2dlTGVBT0hMZ2pnSHhSTUxSWGZmeUlLMC9WN1l1YU5ZRTUwUmE5em9ZcTJuVzl2YmV4OGovR3NhMjFpWitIZ0ZsbTRHQzhJcWZsMkllQ2NsWitGVk5DakFESjFZbC9ZTFV0a2NlZDlLNHlhYTIvMnp2WHp2YmdLRGtsdFRQL1JVZHBRT0xQVjJaelpmKzlQRWNRR3ZTKzJJOG9BKzg1MWdRUVRzT1YrcHpKRHRDSFA0SWxTTmFITVFHT09pbTArRG01UUpDZkhnSTJhb1lUeHN0Nmk3bWRpZEV3ampuZkN1NGYvanlDdEdkOVBFR3BGMUpVam8xeHM2ekRQdFpuUmNOMkhGWFF6eWVQUlJUa1JsNDV0L3J1ZWxZdTltQmNXSVZYMWVUS0gwTE05RENCVzlrZVZON2R0ZlowdW94Sm5PbDV6SitYRkxGUXZNdG92YU1Pc1ZqSmlrMmx0U2M9IiwibWFjIjoiYWE3YTBkMzY5ZGE0OWIxYjk1MmUzN2Y0MjFjMTY0ODY3ZDI0NzdjMWUwZDhlNGRjZmU1MWMyZDRlYzhhN2YzZiIsInRhZyI6IiJ9
+eyJpdiI6IjM4ckdUdk1XazMxQjA4RnpTRUZhc3c9PSIsInZhbHVlIjoib1Q3UWtxdzdjSytwMGVRMW9MT2lERlVxclpTK05mUDk1dlhJd2NwbmtkRnFWZTExV2NZdEROMG8zb2N5ZEN1MW5tMk5JbHMxdDh4Z0NsSzYvdy9TdWNKQ3hBMVhncVMxZkFiSkJLR2VZa0JRMUZYbnF0YXJya0NsN2UwemVkMGpnaUw5Y1Z6enBtcnBPWkR3MW1mRENnU2cvcm9rSXNLMzllV3I0QitKL0xvR0J4MHhhWCtMZERYd3pNeHJiMnBINW42a1dCWkVBNmRhTU14T3FvVzgrMjh3ODd3LzMxcnUzcmRWTjZ2OW1qMis2dkVvRWtINlBmN3YzSXR4Mm12VnJFeGZyckdtL3dwQnhvRWIrTEl0WFJNU2ZEbE5pOTJEaW9LOHlLZ0ZEMjlYdTBBakJma3NvRDdidUZ0bVRkWnZUVmtCVG1oTFBZZEVOa0xyNVdnTExzdGxNL3JLcjJOQ2VqTEh4VGV0LzBJMm5WNm5VWlVRMU50bng3UzhkVnVzVkNGWWtYYTBjS1VEbXNLMk02RHhoQnFUbWVZZGREOEhPQURpejhBY3IwVHlGNGs5THZraUZ2NTZxdTB5L095bFk1d25Za3JiNU1mSUU1YUlMV0VHZzRNVVJOa0dQRXFjM3MvY0ZJSEh2eDZITFMrbDFzV1JaaUFHRWcrV1Fjb0lEVWNKaEFIVFAya1I2RUZZZi9odS82OVZmSTNhek40L2dub2IrYlkvM29rd01uRytiZEVJQ3cwaTZoaHRUeXNDTVEzd0hiTVNsc2NzMWRhOUJpSUJFQjg3dlRkdHE4WTkvdmVudFZ2YjZtY1Ryd1dNWjZ5SGxWZkhMeEhFR2MycSIsIm1hYyI6ImFiZTIyM2NkOTYxYmNkNDA4ZWViZWVlOGIyY2IzNGEwMGFlOGQ4NGM1MGYwNDY2ZWE4ODY5YjllN2ZiOWUxZTgiLCJ0YWciOiIifQ==
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,8 +33,8 @@ services:
             dockerfile: ./dockerfiles/Dockerfile.website
             target: deploy
             args:
-                - LARAVEL_ENV=development
-                - LARAVEL_ENV_FILE=.env.development
+                - LARAVEL_ENV=local
+                - LARAVEL_ENV_FILE=.env
         ports:
             - '80:80'
         networks:
@@ -43,6 +43,8 @@ services:
             - pgsql
             - redis
             - meilisearch
+        environment:
+            - APP_URL=http://localhost
     pgsql:
         image: 'postgres:16'
         ports:

diff --git a/dockerfiles/Dockerfile.website b/dockerfiles/Dockerfile.website
@@ -73,10 +73,9 @@ ENV APP_ENV=${LARAVEL_ENV}
 
 RUN [ -z "${LARAVEL_ENV_FILE_KEY}" ] || ( mv .env.${LARAVEL_ENV} .env.${LARAVEL_ENV}.encrypted && php artisan env:decrypt -n --env=${LARAVEL_ENV} --key=${LARAVEL_ENV_FILE_KEY} )
 RUN php artisan storage:link -n
-RUN php artisan config:cache -n
 RUN php artisan event:cache -n
 RUN php artisan route:cache -n
 RUN php artisan view:cache -n
-RUN php artisan optimize -n
 
-RUN rm .env.${LARAVEL_ENV}*
+COPY --chown=nobody ./etc/entrypoint.sh /entrypoint.sh
+CMD [ "/entrypoint.sh" ]
diff --git a/etc/entrypoint.sh b/etc/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# Cache config and other stuff
+php artisan optimize -n
+rm .env.${LARAVEL_ENV}*
+
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		eyJpdiI6IjV3ZmRHa2ZUMDhUbDQ2UVVUc3VkY0E9PSIsInZhbHVlIjoiU0R5MzIzQmpBekFXbTVGb3JRdU9aNGhQZVAxbGZCaEhtNkFUeTlMaDZnNU1ZcEZkU1lwS0dEMENYbzZkeGU0eW93VDN2NytlamVRM1NTTllqUzI3VzBVUWxLVm1pRThxWTdWdTdGZnpYd3hkNk9mMFRXa0JTaUVva1BHbkdCTERndmZDTkdLMWprRURVWUk3R3lKbWQyRTRra3V3WG9YeURWTlpHQ0VpVDZ2aHQxTG5oRFEraEsydkJvalFiWmdFV3NiOHFGSVN5V1QyQVhOZzRRa1FDUGZSZXg3ZS9HRURUeVJzM2ZPQkNuNDZscXdtZmtUQkxXUWNYT3BsVFZzenMzamdWOHZpMWlwMWlzSDRtLytBUHdYN25OL2Y1M1dIU1lzWko5VlFPV0paYlJQekRVMWZzK0NJZ3hnNXVHREtseFBNc2ZWZWpKeU9JY2dlTGVBT0hMZ2pnSHhSTUxSWGZmeUlLMC9WN1l1YU5ZRTUwUmE5em9ZcTJuVzl2YmV4OGovR3NhMjFpWitIZ0ZsbTRHQzhJcWZsMkllQ2NsWitGVk5DakFESjFZbC9ZTFV0a2NlZDlLNHlhYTIvMnp2WHp2YmdLRGtsdFRQL1JVZHBRT0xQVjJaelpmKzlQRWNRR3ZTKzJJOG9BKzg1MWdRUVRzT1YrcHpKRHRDSFA0SWxTTmFITVFHT09pbTArRG01UUpDZkhnSTJhb1lUeHN0Nmk3bWRpZEV3ampuZkN1NGYvanlDdEdkOVBFR3BGMUpVam8xeHM2ekRQdFpuUmNOMkhGWFF6eWVQUlJUa1JsNDV0L3J1ZWxZdTltQmNXSVZYMWVUS0gwTE05RENCVzlrZVZON2R0ZlowdW94Sm5PbDV6SitYRkxGUXZNdG92YU1Pc1ZqSmlrMmx0U2M9IiwibWFjIjoiYWE3YTBkMzY5ZGE0OWIxYjk1MmUzN2Y0MjFjMTY0ODY3ZDI0NzdjMWUwZDhlNGRjZmU1MWMyZDRlYzhhN2YzZiIsInRhZyI6IiJ9
		eyJpdiI6IjM4ckdUdk1XazMxQjA4RnpTRUZhc3c9PSIsInZhbHVlIjoib1Q3UWtxdzdjSytwMGVRMW9MT2lERlVxclpTK05mUDk1dlhJd2NwbmtkRnFWZTExV2NZdEROMG8zb2N5ZEN1MW5tMk5JbHMxdDh4Z0NsSzYvdy9TdWNKQ3hBMVhncVMxZkFiSkJLR2VZa0JRMUZYbnF0YXJya0NsN2UwemVkMGpnaUw5Y1Z6enBtcnBPWkR3MW1mRENnU2cvcm9rSXNLMzllV3I0QitKL0xvR0J4MHhhWCtMZERYd3pNeHJiMnBINW42a1dCWkVBNmRhTU14T3FvVzgrMjh3ODd3LzMxcnUzcmRWTjZ2OW1qMis2dkVvRWtINlBmN3YzSXR4Mm12VnJFeGZyckdtL3dwQnhvRWIrTEl0WFJNU2ZEbE5pOTJEaW9LOHlLZ0ZEMjlYdTBBakJma3NvRDdidUZ0bVRkWnZUVmtCVG1oTFBZZEVOa0xyNVdnTExzdGxNL3JLcjJOQ2VqTEh4VGV0LzBJMm5WNm5VWlVRMU50bng3UzhkVnVzVkNGWWtYYTBjS1VEbXNLMk02RHhoQnFUbWVZZGREOEhPQURpejhBY3IwVHlGNGs5THZraUZ2NTZxdTB5L095bFk1d25Za3JiNU1mSUU1YUlMV0VHZzRNVVJOa0dQRXFjM3MvY0ZJSEh2eDZITFMrbDFzV1JaaUFHRWcrV1Fjb0lEVWNKaEFIVFAya1I2RUZZZi9odS82OVZmSTNhek40L2dub2IrYlkvM29rd01uRytiZEVJQ3cwaTZoaHRUeXNDTVEzd0hiTVNsc2NzMWRhOUJpSUJFQjg3dlRkdHE4WTkvdmVudFZ2YjZtY1Ryd1dNWjZ5SGxWZkhMeEhFR2MycSIsIm1hYyI6ImFiZTIyM2NkOTYxYmNkNDA4ZWViZWVlOGIyY2IzNGEwMGFlOGQ4NGM1MGYwNDY2ZWE4ODY5YjllN2ZiOWUxZTgiLCJ0YWciOiIifQ==