chore(deps): update actions/checkout action to v5

Excludes tag= from replacement
fix: Replace invalid docker tag characters with underscore
2025-10-25 19:22:02 +02:00 · 2025-10-25 17:53:03 +02:00 · 2025-10-25 17:53:03 +02:00 · 2025-10-25 17:52:29 +02:00 · 2025-10-25 17:46:37 +02:00 · 2025-10-25 17:37:10 +02:00
5 changed files with 11 additions and 52 deletions
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
@ -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
--- 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}}
--- a/get_rate.sh
+++ b/get_rate.sh
@ -1,5 +0,0 @@
-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,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);
 ?>
--- a/web/www/sunders/index.php
+++ b/web/www/sunders/index.php
@ -53,7 +53,6 @@
 <!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"/>

@ -232,47 +231,13 @@
      <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>
-        &#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>
+        <a href="<?php echo IMPRESSUM_URL?>">Impressum</a>
        <br><br>
        <?php echo translate($i18nCommon, $i18nCommonDefault, 'gdpr', [], [], []); ?>
        <br><br>
Author	SHA1	Message	Date
Renovate	3c4478eca3	chore(deps): update actions/checkout action to v5 Some checks failed Build (and tag) Images / build (push) Failing after 1s Details Build (and tag) Images / build (pull_request) Failing after 0s Details	2025-10-25 19:22:02 +02:00
ViMaSter	9138d57429	Excludes `tag=` from replacement All checks were successful Build (and tag) Images / build (pull_request) Successful in 46s Details Build (and tag) Images / build (push) Successful in 48s Details	2025-10-25 17:53:03 +02:00
ViMaSter	9cf8cffee4	fix: Replace invalid docker tag characters with underscore	2025-10-25 17:53:03 +02:00
asohh	afc3828575	Merge pull request 'renamed db-user to CAMERA_SELECT_USER' (#22 ) from sunders-18 into main All checks were successful Build (and tag) Images / build (push) Successful in 47s Details Reviewed-on: #22 Reviewed-by: Vincent Mahnke <vimaster@noreply.git.hamburg.ccc.de>	2025-10-25 17:52:29 +02:00
asohh	3b92dbade7	renamed db-user to CAMERA_SELECT_USER All checks were successful Build (and tag) Images / build (push) Successful in 47s Details Build (and tag) Images / build (pull_request) Successful in 47s Details	2025-10-25 17:46:37 +02:00
asohh	b3a38df17a	Merge pull request 'added impressum as a var' (#20 ) from impressum-as-var into main All checks were successful Build (and tag) Images / build (push) Successful in 47s Details Reviewed-on: #20 Reviewed-by: Vincent Mahnke <vimaster@noreply.git.hamburg.ccc.de>	2025-10-25 17:37:10 +02:00
asohh	7ab17a1af5	added impressum as a var All checks were successful Build (and tag) Images / build (push) Successful in 49s Details Build (and tag) Images / build (pull_request) Successful in 47s Details	2025-10-25 17:33:24 +02:00
asohh	c1c11dbabd	Merge pull request 'Minor updates to compose file' (#19 ) from docker-compose into main All checks were successful Build (and tag) Images / build (push) Successful in 47s Details Reviewed-on: #19	2025-10-25 17:29:16 +02:00
ViMaSter	1d38aea2ca	chore: Removes unused SELinux flag due to volume usage All checks were successful Build (and tag) Images / build (push) Successful in 48s Details Build (and tag) Images / build (pull_request) Successful in 47s Details	2025-10-25 17:28:11 +02:00
ViMaSter	67ebf21a09	chore: Removes unused build steps and exposed ports	2025-10-25 17:28:11 +02:00
asohh	9a141276ed	Merge pull request 'added impressum' (#16 ) from container into main All checks were successful Build (and tag) Images / build (push) Successful in 48s Details Reviewed-on: #16	2025-10-25 17:18:04 +02:00
asohh	288b76d30e	Merge branch 'main' into container All checks were successful Build (and tag) Images / build (push) Successful in 48s Details Build (and tag) Images / build (pull_request) Successful in 47s Details	2025-10-25 17:16:51 +02:00
asohh	969614a000	Merge pull request 'Removes unused files' (#15 ) from unused-file into main All checks were successful Build (and tag) Images / build (push) Successful in 48s Details Reviewed-on: #15	2025-10-25 17:09:22 +02:00
asohh	c5cc45aa23	added impressum All checks were successful Build (and tag) Images / build (push) Successful in 1m9s Details Build (and tag) Images / build (pull_request) Successful in 1m1s Details	2025-10-25 16:56:26 +02:00
ViMaSter	fb7db68946	Removes unused files All checks were successful Build (and tag) Images / build (push) Successful in 46s Details Build (and tag) Images / build (pull_request) Successful in 49s Details	2025-10-25 16:52:46 +02:00