From 3b92dbade71c582f5fc7912a9f5366a1a1a99410 Mon Sep 17 00:00:00 2001 From: asohh Date: Sat, 25 Oct 2025 17:46:37 +0200 Subject: [PATCH 1/3] renamed db-user to CAMERA_SELECT_USER --- docker-compose.yml | 4 ++-- web/www/sunders/config.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 128a250..e552736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,8 @@ services: environment: MYSQL_HOST: db MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} - MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}} - MYSQL_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}} + CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}} + CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}} DEFAULT_ZOOM: 12 DEFAULT_LAT: 0 DEFAULT_LON: 0 diff --git a/web/www/sunders/config.php b/web/www/sunders/config.php index 3050d6c..e39b407 100644 --- a/web/www/sunders/config.php +++ b/web/www/sunders/config.php @@ -9,8 +9,8 @@ define('MYSQL_HOST', getenv('MYSQL_HOST') ?: ''); define('MYSQL_DB', getenv('MYSQL_DB') ?: ''); - define('MYSQL_USER', getenv('MYSQL_USER') ?: ''); - define('MYSQL_PASSWORD', getenv('MYSQL_PASSWORD') ?: ''); + define('MYSQL_USER', getenv('CAMERA_SELECT_USER') ?: ''); + define('MYSQL_PASSWORD', getenv('CAMERA_SELECT_USER_PASSWORD') ?: ''); define('USE_STATISTICS', false); ?> \ No newline at end of file From 9cf8cffee458e00f4011f919075042acbb14cd80 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Sat, 25 Oct 2025 17:44:59 +0200 Subject: [PATCH 2/3] fix: Replace invalid docker tag characters with underscore --- .forgejo/workflows/images.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 8c8f5a4..4095e84 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -28,7 +28,8 @@ jobs: if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then echo "tag=latest" >> $GITHUB_OUTPUT else - echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT + # renovate creates sub branches with `/`; these break the tagging in the build process + echo "tag=${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g' >> $GITHUB_OUTPUT fi - name: Build web image From 9138d574295598ad7dd76cb3460ac61d324b7408 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Sat, 25 Oct 2025 17:51:09 +0200 Subject: [PATCH 3/3] Excludes `tag=` from replacement --- .forgejo/workflows/images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 4095e84..940ce02 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -29,7 +29,7 @@ jobs: echo "tag=latest" >> $GITHUB_OUTPUT else # renovate creates sub branches with `/`; these break the tagging in the build process - echo "tag=${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g' >> $GITHUB_OUTPUT + echo tag=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT fi - name: Build web image