Fixed prod api url

This commit is contained in:
Tim Lappe 2025-04-26 19:06:23 +02:00
parent a86890da2b
commit cbf1f0518c
5 changed files with 19 additions and 4 deletions

View File

@ -26,5 +26,5 @@ APP_SECRET=71bf50bfb778d456b3a376ff60d5dcd8
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
DATABASE_URL="postgresql://postgres:postgres@postgres:5432/postgres?serverVersion=16&charset=utf8" DATABASE_URL="postgresql://postgres:postgres@calendi-postgres:5432/postgres?serverVersion=16&charset=utf8"
###< doctrine/doctrine-bundle ### ###< doctrine/doctrine-bundle ###

View File

@ -16,13 +16,12 @@ services:
- proxy - proxy
postgres: postgres:
hostname: calendi-postgres
image: postgres:15 image: postgres:15
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres POSTGRES_DB: postgres
ports:
- "5432:5432"
volumes: volumes:
- ./var/postgres_data:/var/lib/postgresql/data - ./var/postgres_data:/var/lib/postgresql/data
networks: networks:

View File

@ -17,6 +17,7 @@ services:
- proxy - proxy
postgres: postgres:
hostname: calendi-postgres
image: postgres:15 image: postgres:15
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres

View File

@ -64,6 +64,8 @@ FROM builder AS prod
WORKDIR /var/www/html WORKDIR /var/www/html
COPY --chmod=755 docker/entrypoint.prod.sh /entrypoint.prod.sh
COPY . . COPY . .
COPY docker/nginx/default.conf /etc/nginx/sites-enabled/default COPY docker/nginx/default.conf /etc/nginx/sites-enabled/default
@ -71,4 +73,4 @@ RUN cd backend && composer install
RUN cd frontend && npm install && npm run build RUN cd frontend && npm install && npm run build
# Set entrypoint # Set entrypoint
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.prod.sh"]

13
docker/entrypoint.prod.sh Normal file
View File

@ -0,0 +1,13 @@
#!/bin/bash
set -e
# Start PHP-FPM service
service php8.4-fpm start
# Change to frontend directory and start npm in background
cd /var/www/html/frontend && export REACT_APP_API_URL=https://calendi.strolap.com && npm run start &
cd /var/www/html/backend && composer rebuild-db
# Start Nginx in foreground to keep container running
exec nginx -g 'daemon off;'