AaronPo/the-biergarten-app
1
0
Fork 0
mirror of https://github.com/aaronpo97/the-biergarten-app.git synced 2026-10-15 10:04:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL Server port mapping

Browse Source
This commit is contained in:
Aaron Po
2026-08-30 05:46:12 -04:00
parent 2de91bd0be
commit 2c32caef18
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/docker-compose.db.yaml
View File

@@ -9,7 +9,7 @@ services:
SA_PASSWORD: "${DB_PASSWORD}" SA_PASSWORD: "${DB_PASSWORD}"
MSSQL_PID: "Express" MSSQL_PID: "Express"
ports: ports:
- "1434:1433" - "1433:1433"
volumes: volumes:
- sqlserverdata-dev:/var/opt/mssql - sqlserverdata-dev:/var/opt/mssql
healthcheck: healthcheck:

2
web/docker-compose.dev.yaml
View File

@@ -10,7 +10,7 @@ services:
SA_PASSWORD: "${DB_PASSWORD}" SA_PASSWORD: "${DB_PASSWORD}"
MSSQL_PID: "Express" MSSQL_PID: "Express"
ports: ports:
- "1434:1433" - "1433:1433"
volumes: volumes:
- sqlserverdata-dev:/var/opt/mssql - sqlserverdata-dev:/var/opt/mssql
healthcheck: healthcheck:

7
web/generate-env.sh
View File

@@ -52,6 +52,12 @@ gen_username() {
} }
DB_PASSWORD_VAL=$(gen_password) DB_PASSWORD_VAL=$(gen_password)
DB_SERVER_VAL=$(grep -m1 '^DB_SERVER=' "$TEMPLATE_FILE" | cut -d= -f2-)
DB_NAME_VAL=$(grep -m1 '^DB_NAME=' "$TEMPLATE_FILE" | cut -d= -f2-)
DB_USER_VAL=$(grep -m1 '^DB_USER=' "$TEMPLATE_FILE" | cut -d= -f2-)
DB_CONNECTION_STRING_VAL="Server=${DB_SERVER_VAL};Database=${DB_NAME_VAL};User Id=${DB_USER_VAL};Password=${DB_PASSWORD_VAL};TrustServerCertificate=True;"
ACCESS_TOKEN_SECRET_VAL=$(gen_jwt_secret) ACCESS_TOKEN_SECRET_VAL=$(gen_jwt_secret)
REFRESH_TOKEN_SECRET_VAL=$(gen_jwt_secret) REFRESH_TOKEN_SECRET_VAL=$(gen_jwt_secret)
CONFIRMATION_TOKEN_SECRET_VAL=$(gen_jwt_secret) CONFIRMATION_TOKEN_SECRET_VAL=$(gen_jwt_secret)
@@ -65,6 +71,7 @@ cp "$TEMPLATE_FILE" "$OUTPUT_FILE"
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
sed \ sed \
-e "s|^DB_PASSWORD=.*|DB_PASSWORD=${DB_PASSWORD_VAL}|" \ -e "s|^DB_PASSWORD=.*|DB_PASSWORD=${DB_PASSWORD_VAL}|" \
-e "s|^# DB_CONNECTION_STRING=.*|# DB_CONNECTION_STRING=${DB_CONNECTION_STRING_VAL}|" \
-e "s|^ACCESS_TOKEN_SECRET=.*|ACCESS_TOKEN_SECRET=${ACCESS_TOKEN_SECRET_VAL}|" \ -e "s|^ACCESS_TOKEN_SECRET=.*|ACCESS_TOKEN_SECRET=${ACCESS_TOKEN_SECRET_VAL}|" \
-e "s|^REFRESH_TOKEN_SECRET=.*|REFRESH_TOKEN_SECRET=${REFRESH_TOKEN_SECRET_VAL}|" \ -e "s|^REFRESH_TOKEN_SECRET=.*|REFRESH_TOKEN_SECRET=${REFRESH_TOKEN_SECRET_VAL}|" \
-e "s|^CONFIRMATION_TOKEN_SECRET=.*|CONFIRMATION_TOKEN_SECRET=${CONFIRMATION_TOKEN_SECRET_VAL}|" \ -e "s|^CONFIRMATION_TOKEN_SECRET=.*|CONFIRMATION_TOKEN_SECRET=${CONFIRMATION_TOKEN_SECRET_VAL}|" \