From 8c488d342b772631e0edc7dcc45e8b88f3494ea6 Mon Sep 17 00:00:00 2001
From: groot <git@send.nrw>
Date: Sat, 4 Jan 2025 14:53:23 +0000
Subject: [PATCH 1/2] =?UTF-8?q?.gitea/workflows/registry.yml=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/registry.yml | 87 +++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 .gitea/workflows/registry.yml

diff --git a/.gitea/workflows/registry.yml b/.gitea/workflows/registry.yml
new file mode 100644
index 0000000..70a5162
--- /dev/null
+++ b/.gitea/workflows/registry.yml
@@ -0,0 +1,87 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'main'
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_ORG: sendnrw
+      DOCKER_LATEST: latest
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."git.send.nrw"] 
+              http = true
+              insecure = true                        
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: git.send.nrw # 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: Build and push PHP83
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_PHP83
+          platforms: |
+            linux/amd64                                   
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php83:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php83:${{ env.DOCKER_LATEST }}
+
+      - name: Build and push PHP84
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_PHP84
+          platforms: |
+            linux/amd64                                   
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php84:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php84:${{ env.DOCKER_LATEST }}
+
+      - name: Build and push Web
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_WEB
+          platforms: |
+            linux/amd64                                   
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_web:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_web:${{ env.DOCKER_LATEST }}
+
+      - name: Build and push Redis
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_Redis
+          platforms: |
+            linux/amd64                                   
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_redis:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_redis:${{ env.DOCKER_LATEST }}
\ No newline at end of file
-- 
2.49.1


From 4dfc299ca185f657505b9b644e34ed6812ce2924 Mon Sep 17 00:00:00 2001
From: groot <git@send.nrw>
Date: Sat, 4 Jan 2025 14:54:52 +0000
Subject: [PATCH 2/2] compose.yml aktualisiert

---
 compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose.yml b/compose.yml
index 6814d66..adca1f1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ networks:
         - subnet: 172.17.0.0/24
 services:
   web:
-    image: git.send.nrw/sendnrw/sid_web_nginx:latest
+    image: git.send.nrw/sendnrw/security_in_depth_web_web:latest
     volumes:
         - /docker/mnt/stack0/web1/server/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
         - /docker/mnt/stack0/web1/server/etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
@@ -33,7 +33,7 @@ services:
     ports:
       - "8080:80"
   php83:
-    image: git.send.nrw/sendnrw/sid_web_php83:latest
+    image: git.send.nrw/sendnrw/security_in_depth_web_php83:latest
     volumes:
         - /docker/mnt/stack0/web1/server/etc/php83/php-fpm.conf:/etc/php83/php-fpm.conf
         - /docker/mnt/stack0/web1/server/etc/php83/php.ini:/etc/php83/php.ini
@@ -53,7 +53,7 @@ services:
       web_network_1:
         ipv4_address: 172.17.0.83
   php84:
-    image: git.send.nrw/sendnrw/sid_web_php84:latest
+    image: git.send.nrw/sendnrw/security_in_depth_web_php84:latest
     volumes:
         - /docker/mnt/stack0/web1/server/etc/php84/php-fpm.conf:/etc/php84/php-fpm.conf
         - /docker/mnt/stack0/web1/server/etc/php84/php.ini:/etc/php84/php.ini
@@ -73,7 +73,7 @@ services:
       web_network_1:
         ipv4_address: 172.17.0.84
   redis:
-    image: git.send.nrw/sendnrw/sid_web_redis:latest
+    image: git.send.nrw/sendnrw/security_in_depth_web_redis:latest
     volumes:
         - /docker/mnt/stack0/web1/server/etc/redis/redis.conf:/etc/redis.conf
     deploy:
-- 
2.49.1