From 3d9755169de674f5eff88921a9f1ae342e477f9b Mon Sep 17 00:00:00 2001 From: Renovate Date: Sat, 25 Oct 2025 14:46:30 +0000 Subject: [PATCH 01/10] chore(deps): update quay.io/fedora/fedora-minimal docker tag to v44 --- data_handler/Containerfile | 2 +- data_handler_python/Containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data_handler/Containerfile b/data_handler/Containerfile index 342ae74..48c115d 100644 --- a/data_handler/Containerfile +++ b/data_handler/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-minimal:43 +FROM quay.io/fedora/fedora-minimal:44 RUN microdnf install -y php-cli php-mysqli php-bcmath php-xml python-lxml gunzip https://raw.githubusercontent.com/rpmsphere/x86_64/master/d/dcron-4.5-7.1.x86_64.rpm && microdnf clean all COPY ./utils/* /opt/ COPY ./data_init/*.sql /opt/init/init.sql diff --git a/data_handler_python/Containerfile b/data_handler_python/Containerfile index ea1e354..475476d 100644 --- a/data_handler_python/Containerfile +++ b/data_handler_python/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-minimal:43 +FROM quay.io/fedora/fedora-minimal:44 RUN microdnf install -y python-pip && microdnf clean all && pip install OSMPythonTools COPY ./lookup_country.py /opt/ \ No newline at end of file From fb7db68946cdf97e699ffd04582760395fbd2684 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Sat, 25 Oct 2025 16:52:46 +0200 Subject: [PATCH 02/10] Removes unused files --- get_rate.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 get_rate.sh diff --git a/get_rate.sh b/get_rate.sh deleted file mode 100644 index a09659d..0000000 --- a/get_rate.sh +++ /dev/null @@ -1,5 +0,0 @@ -before=$(ls migrations | wc -l) -sleep 60 -after=$(ls migrations | wc -l) -let dif=after-before -echo "$dif" \ No newline at end of file From c5cc45aa23b011151a7e9b54126ae81f163aef30 Mon Sep 17 00:00:00 2001 From: asohh Date: Sat, 25 Oct 2025 16:56:26 +0200 Subject: [PATCH 03/10] added impressum --- web/www/sunders/index.php | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/web/www/sunders/index.php b/web/www/sunders/index.php index d8fe490..af57316 100644 --- a/web/www/sunders/index.php +++ b/web/www/sunders/index.php @@ -53,7 +53,6 @@ - @@ -232,47 +231,13 @@
❖ ❖ ❖


-
- Onion Service -
-
- sunders ♥ onion -
-

- ❖ -




❖


- МАКС КАМВАЧ
- Aljoscha Rompe Laan 5
- 2517 AR Den Haag
- hello () sunders () uber () space

-

-
- 8252 010B FDD9 5D6C DDD4
- 7415 3800 574F FB00 4622

-
- -
-
- - + Impressum



From 67ebf21a097defaa92d077c466e0c61b0b42ecd3 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Sat, 25 Oct 2025 17:20:03 +0200 Subject: [PATCH 04/10] chore: Removes unused build steps and exposed ports --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cacf904..6830ee2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,6 @@ services: MYSQL_DATABASE: camera # ${{secrets.MYSQL_DATABASE}} MYSQL_USER: camera # ${{secrets.MYSQL_USER}} MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}} - ports: - - "3306:3306" volumes: - mariadb:/var/lib/mysql:Z healthcheck: @@ -20,7 +18,6 @@ services: web: image: git.hamburg.ccc.de/ccchh/sunders/web:latest - build: ./web/ environment: MYSQL_HOST: db MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} @@ -38,7 +35,6 @@ services: data_handler: image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest - build: ./data_handler/ environment: MYSQL_HOST: db MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} From 1d38aea2ca34f1e72a66b0fa68df7ebed6a428dd Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Sat, 25 Oct 2025 17:26:46 +0200 Subject: [PATCH 05/10] chore: Removes unused SELinux flag due to volume usage --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6830ee2..a97740f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: MYSQL_USER: camera # ${{secrets.MYSQL_USER}} MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}} volumes: - - mariadb:/var/lib/mysql:Z + - mariadb:/var/lib/mysql healthcheck: test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"] interval: 10s From 7ab17a1af54ab5f80deab96ada5ff4034512b257 Mon Sep 17 00:00:00 2001 From: asohh Date: Sat, 25 Oct 2025 17:33:24 +0200 Subject: [PATCH 06/10] added impressum as a var --- docker-compose.yml | 1 + web/www/sunders/config.php | 1 + web/www/sunders/index.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cacf904..128a250 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,7 @@ services: DEFAULT_LAT: 0 DEFAULT_LON: 0 DEFAULT_LANGUAGE: en + IMPRESSUM_URL: https://hamburg.ccc.de/imprint/ ports: - "8080:80" depends_on: diff --git a/web/www/sunders/config.php b/web/www/sunders/config.php index c874eca..3050d6c 100644 --- a/web/www/sunders/config.php +++ b/web/www/sunders/config.php @@ -5,6 +5,7 @@ define('DEFAULT_LANGUAGE', getenv('DEFAULT_LANGUAGE') ?: 'en'); define('DEFAULT_PIE', 'country'); define('DEFAULT_TIME', 'single'); + define('IMPRESSUM_URL', getenv('IMPRESSUM_URL') ?: ''); define('MYSQL_HOST', getenv('MYSQL_HOST') ?: ''); define('MYSQL_DB', getenv('MYSQL_DB') ?: ''); diff --git a/web/www/sunders/index.php b/web/www/sunders/index.php index af57316..81932de 100644 --- a/web/www/sunders/index.php +++ b/web/www/sunders/index.php @@ -237,7 +237,7 @@

❖


- Impressum + Impressum



From 3b92dbade71c582f5fc7912a9f5366a1a1a99410 Mon Sep 17 00:00:00 2001 From: asohh Date: Sat, 25 Oct 2025 17:46:37 +0200 Subject: [PATCH 07/10] 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 08/10] 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 09/10] 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 From 773b5e335651d2aa6f23e092e48e491b6cd819c6 Mon Sep 17 00:00:00 2001 From: Renovate Date: Sat, 25 Oct 2025 14:46:30 +0000 Subject: [PATCH 10/10] chore(deps): update quay.io/fedora/fedora-minimal docker tag to v44 --- data_handler/Containerfile | 2 +- data_handler_python/Containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data_handler/Containerfile b/data_handler/Containerfile index 342ae74..48c115d 100644 --- a/data_handler/Containerfile +++ b/data_handler/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-minimal:43 +FROM quay.io/fedora/fedora-minimal:44 RUN microdnf install -y php-cli php-mysqli php-bcmath php-xml python-lxml gunzip https://raw.githubusercontent.com/rpmsphere/x86_64/master/d/dcron-4.5-7.1.x86_64.rpm && microdnf clean all COPY ./utils/* /opt/ COPY ./data_init/*.sql /opt/init/init.sql diff --git a/data_handler_python/Containerfile b/data_handler_python/Containerfile index ea1e354..475476d 100644 --- a/data_handler_python/Containerfile +++ b/data_handler_python/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-minimal:43 +FROM quay.io/fedora/fedora-minimal:44 RUN microdnf install -y python-pip && microdnf clean all && pip install OSMPythonTools COPY ./lookup_country.py /opt/ \ No newline at end of file