chore(deps): update quay.io/fedora/fedora-minimal docker tag to v44

2025-10-25 14:46:30 +00:00
5 changed files with 51 additions and 10 deletions
--- 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
--- 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}}
--- a/get_rate.sh
+++ 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"
--- 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);
 ?>
--- a/web/www/sunders/index.php
+++ b/web/www/sunders/index.php
@ -53,6 +53,7 @@
 <!DOCTYPE html>
 <html>
  <head>
+    <meta http-equiv="onion-location" content="http://sunders.ahcbagldgzdpa74g2mh74fvk5zjzpfjbvgqin6g3mfuu66tynv2gkiid.onion"/>
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width,initial-scale=1.0"/>

@ -231,13 +232,47 @@
      <div class="slider-item slider-footer text-small">
        &#x2756; &#x2756; &#x2756;
        <br><br><br>
+        <div class="slider-footer-title">
+          Onion Service
+        </div>
+        <div class="slider-onion-link">
+          <a href="http://sunders.ahcbagldgzdpa74g2mh74fvk5zjzpfjbvgqin6g3mfuu66tynv2gkiid.onion/">sunders &#9829; onion</a>
+        </div>
+        <br><br>
+        &#x2756;
+        <br><br><br>
        <?php
          addListCredits($pathToWebFolder.'json/credits.json', $i18nCredits, $i18nCreditsDefault);
        ?>
        <br><br>
        &#x2756;
        <br><br><br>
-        <a href="<?php echo IMPRESSUM_URL?>">Impressum</a>
+        &#x041C;&#x0410;&#x041A;&#x0421; &#x041A;&#x0410;&#x041C;&#x0412;&#x0410;&#x0427;<br>
+        Aljoscha Rompe Laan 5<br>
+        2517 AR Den Haag<br>
+        &#104;&#101;&#108;&#108;&#111; &#x28;<?php echo translate($i18nCommon, $i18nCommonDefault, 'at', [], [], []); ?>&#x29; &#x73;&#x75;&#x6e;&#x64;&#x65;&#x72;&#x73; &#x28;<?php echo translate($i18nCommon, $i18nCommonDefault, 'dot', [], [], []); ?>&#x29; &#x75;&#x62;&#x65;&#x72; &#x28;<?php echo translate($i18nCommon, $i18nCommonDefault, 'dot', [], [], []); ?>&#x29; &#x73;&#x70;&#x61;&#x63;&#x65;<br><br>
+        <?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-pgp', [$pathToWebFolder.'files/sunders.asc'], [], []); ?><br><br>
+        <div class="monospace">
+          8252 010B FDD9 5D6C DDD4<br>
+          7415 3800 574F FB00 4622<br><br>
+        </div>
+        <i>
+          <?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-note', [], [], []); ?><br>
+          <?php echo translate($i18nCommon, $i18nCommonDefault, 'footer-your-key', [], [], []); ?><br>
+          <?php
+            if ($initialLanguage == 'de') {
+              echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', ['https://netzpolitik.org/2013/anleitung-so-verschlusselt-ihr-eure-e-mails-mit-pgp/'], [], []);
+            } elseif ($initialLanguage == 'es') {
+              echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/es/module/como-usar-pgp-para-windows-pc', 'https://ssd.eff.org/es/module/c%C3%B3mo-usar-pgp-para-mac-os-x', 'https://ssd.eff.org/es/module/como-usar-pgp-para-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
+            } elseif ($initialLanguage == 'fr') {
+              echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/fr/module/pgp-sous-windows-le-ba-ba', 'https://ssd.eff.org/fr/module/guide-dutilisation-de-pgp-pour-mac-os-x', 'https://ssd.eff.org/fr/module/pgp-sous-linux-le-ba-ba'], ['Windows', 'macOS', 'GNU/Linux']], []);
+            } elseif ($initialLanguage == 'ru') {
+              echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-windows', 'https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-mac', 'https://ssd.eff.org/ru/module/%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-pgp-%D0%B4%D0%BB%D1%8F-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
+            } else {
+              echo translate($i18nCommon, $i18nCommonDefault, 'footer-help', [], [['https://ssd.eff.org/en/module/how-use-pgp-windows', 'https://ssd.eff.org/en/module/how-use-pgp-mac-os-x', 'https://ssd.eff.org/en/module/how-use-pgp-linux'], ['Windows', 'macOS', 'GNU/Linux']], []);
+            }
+          ?>
+        </i>
        <br><br>
        <?php echo translate($i18nCommon, $i18nCommonDefault, 'gdpr', [], [], []); ?>
        <br><br>