diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 8c8f5a4..940ce02 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=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT
fi
- name: Build web image
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
diff --git a/docker-compose.yml b/docker-compose.yml
index cacf904..4509256 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,10 +7,8 @@ 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
+ - mariadb:/var/lib/mysql
healthcheck:
test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
interval: 10s
@@ -20,16 +18,16 @@ services:
web:
image: git.hamburg.ccc.de/ccchh/sunders/web:latest
- build: ./web/
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
DEFAULT_LANGUAGE: en
+ IMPRESSUM_URL: https://hamburg.ccc.de/imprint/
ports:
- "8080:80"
depends_on:
@@ -38,7 +36,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}}
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
diff --git a/web/www/sunders/config.php b/web/www/sunders/config.php
index c874eca..e39b407 100644
--- a/web/www/sunders/config.php
+++ b/web/www/sunders/config.php
@@ -5,11 +5,12 @@
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') ?: '');
- 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
diff --git a/web/www/sunders/index.php b/web/www/sunders/index.php
index d8fe490..81932de 100644
--- a/web/www/sunders/index.php
+++ b/web/www/sunders/index.php
@@ -53,7 +53,6 @@
-
@@ -232,47 +231,13 @@