Merge pull request 'main' (#3) from main into devel

Reviewed-on: #3

.gitea/workflows/build_nopush.yml

@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
 on:
   push:
     branches:
-      - devel
+      - main
     paths:
       - "Dockerfile"
 
@@ -11,8 +11,9 @@ jobs:
   Explore-Gitea-Actions:
     runs-on: ubuntu-latest
     env:
-      REGISTRY: registry.tuxnet.lan
+      REGISTRY: git.cooltux.net
       IMAGE: db/pg_dump
+      DOCKER_ORG: ${{ secrets.DOCKER_USERNAME }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -24,9 +25,22 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with: # replace it with your local IP
           config-inline: |
-            [registry."registry.tuxnet.lan"] 
-              http = true
-              insecure = true
+            [registry."git.cooltux.net"] 
+              http = false
+              insecure = false
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }} # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          # echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
 
       - name: Set Docker Version
         id: get_version
@@ -43,4 +57,5 @@ jobs:
           platforms: |
             linux/amd64
           push: false
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.get_version.outputs.tag }}
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.get_version.outputs.tag }}

Dockerfile

@@ -4,9 +4,12 @@ LABEL maintainer="development@cooltux.net"
 ARG VERSION=16-20240926
 
 # PostgreSQL-Client installieren
-RUN apk update ; \
+RUN apk update --no-cache ; \
     apk add --no-cache postgresql16-client
 
+# Erstelle einen Benutzer mit UID 26
+RUN adduser -u 1000 -D -S backupuser
+
 # Arbeitsverzeichnis erstellen
 WORKDIR /backup
 
@@ -16,5 +19,8 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 # Skript ausführbar machen
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
+# Wechsle den Benutzer auf den erstellten Benutzer mit UID 26
+USER 1000
+
 # Festlegen des EntryPoints für das Docker-Image
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

entrypoint.sh

@@ -13,7 +13,7 @@ echo "$PGHOST:5432:$PGDATABASE:$PGUSER:$PGPASSWORD" > ~/.pgpass
 chmod 600 ~/.pgpass
 
 # Optional: Standardwert für den Dateinamen der Sicherung
-BACKUP_FILE=${BACKUP_FILE:-"/backup/$PGDATABASE_$(date +%Y%m%d_%H%M%S).sql"}
+BACKUP_FILE=${BACKUP_FILE:-"/backup/$(echo $PGDATABASE)DB_$(date +%d-%m-%Y).sql"}
 
 # Führe den pg_dump-Befehl aus (pg_dump wird automatisch die .pgpass-Datei verwenden)
 pg_dump -h "$PGHOST" -U "$PGUSER" -d "$PGDATABASE" -F c -f "$BACKUP_FILE"