Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,20 @@ COPY meta/image/dev/run.dev /app/run
CMD ["sh", "/app/run"]

###################################################
# FROM backend-base AS final
# TODO
FROM backend-base AS final

ENV APP_ENV=prod \
APP_DEBUG=0

COPY backend /app/backend

RUN composer install --no-interaction --no-dev --optimize-autoloader --classmap-authoritative --no-scripts

COPY --from=frontend-prod /app/frontend/build /app/static

COPY meta/image/prod/Caddyfile.prod /etc/caddy/Caddyfile
COPY meta/image/prod/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY meta/image/prod/run.prod /app/run

EXPOSE 80
CMD ["sh", "/app/run"]
12 changes: 5 additions & 7 deletions backend/.env
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
APP_ENV=dev

###> symfony/framework-bundle ###
APP_SECRET=Qgg+kph9o0lULpebas4C9xa+tvoNC5b94rCjRf/5gAY=
APP_SECRET=
###< symfony/framework-bundle ###

DATABASE_URL="postgresql://postgres:postgres@hyvor-service-pgsql:5432/hyvor_reader?serverVersion=16&charset=utf8"
HYVOR_FAKE=1
DATABASE_URL=

###> symfony/messenger ###
MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
MESSENGER_TRANSPORT_DSN=
###< symfony/messenger ###

###> symfony/lock ###
# Choose one of the stores below
# postgresql+advisory://db_user:db_password@localhost/db_name
LOCK_DSN=flock
LOCK_DSN=
###< symfony/lock ###
10 changes: 10 additions & 0 deletions backend/.env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
APP_ENV=dev

APP_SECRET=Qgg+kph9o0lULpebas4C9xa+tvoNC5b94rCjRf/5gAY=

DATABASE_URL="postgresql://postgres:postgres@hyvor-service-pgsql:5432/hyvor_reader?serverVersion=16&charset=utf8"
HYVOR_FAKE=1

MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0

LOCK_DSN=flock
11 changes: 3 additions & 8 deletions backend/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"doctrine/doctrine-bundle": "^2.15",
"doctrine/doctrine-migrations-bundle": "^3.4.2",
"doctrine/orm": "^3.5.0",
"nesbot/carbon": "^3.10.1",
"hyvor/internal": "^3.1.4",
"nesbot/carbon": "^3.10.1",
"phpdocumentor/reflection-docblock": "^5.6",
"phpstan/phpdoc-parser": "^2.3",
"runtime/frankenphp-symfony": "^0.2.0",
Expand All @@ -26,6 +26,7 @@
"symfony/http-client": "7.3.*",
"symfony/lock": "7.3.*",
"symfony/messenger": "7.3.*",
"symfony/monolog-bundle": "^3.10",
"symfony/property-access": "7.3.*",
"symfony/property-info": "7.3.*",
"symfony/runtime": "7.3.*",
Expand Down Expand Up @@ -67,13 +68,7 @@
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts"
]
}
},
"conflict": {
"symfony/symfony": "*"
Expand Down
Loading