diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 940ce02..8c8f5a4 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -28,8 +28,7 @@ jobs:
if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
echo "tag=latest" >> $GITHUB_OUTPUT
else
- # 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
+ echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
fi
- name: Build web image
diff --git a/docker-compose.yml b/docker-compose.yml
index 4509256..cacf904 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,10 @@ 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
+ - mariadb:/var/lib/mysql:Z
healthcheck:
test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
interval: 10s
@@ -18,16 +20,16 @@ services:
web:
image: git.hamburg.ccc.de/ccchh/sunders/web:latest
+ build: ./web/
environment:
MYSQL_HOST: db
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
- CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
- CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
+ MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
+ MYSQL_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:
@@ -36,6 +38,7 @@ 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
new file mode 100644
index 0000000..a09659d
--- /dev/null
+++ b/get_rate.sh
@@ -0,0 +1,5 @@
+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 e39b407..c874eca 100644
--- a/web/www/sunders/config.php
+++ b/web/www/sunders/config.php
@@ -5,12 +5,11 @@
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('CAMERA_SELECT_USER') ?: '');
- define('MYSQL_PASSWORD', getenv('CAMERA_SELECT_USER_PASSWORD') ?: '');
+ define('MYSQL_USER', getenv('MYSQL_USER') ?: '');
+ define('MYSQL_PASSWORD', getenv('MYSQL_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 81932de..d8fe490 100644
--- a/web/www/sunders/index.php
+++ b/web/www/sunders/index.php
@@ -53,6 +53,7 @@
+
@@ -231,13 +232,47 @@