Tweaks

.gitea/workflows/fedora.yaml

@@ -4,18 +4,10 @@ on:
     branches: ["main"]
     paths:
       - "containers/fedora/**"
-      - "containers/go/**"
-      - "containers/infra/**"
+      - "containers/dotnet/**"
+      - "containers/rust/**"
+      - "containers/php/**"
       - ".gitea/workflows/fedora.yaml"
-  pull_request:
-    branches: ["main"]
-    paths:
-      - "containers/fedora/**"
-      - "containers/go/**"
-      - "containers/infra/**"
-      - ".gitea/workflows/fedora.yaml"
-  schedule:
-    - cron: "0 16 * * FRI"
 
 jobs:
   fedora-build:
@@ -31,30 +23,43 @@ jobs:
           registry: git.plabble.org
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build and push fedora container
+
+      - name: Build and push Fedora container
         uses: docker/build-push-action@v5
         with:
           context: ./containers/fedora
           file: ./containers/fedora/Containerfile
           push: true
-          tags: git.plabble.org/job79/fedora:${{ github.ref_name }}
+          tags: git.plabble.org/maurice/fedora:${{ github.ref_name }}
           build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-      - name: Build and push go container
+      
+      - name: Build and push Rust container
         uses: docker/build-push-action@v5
         with:
-          context: ./containers/go
-          file: ./containers/go/Containerfile
+          context: ./containers/rust
+          file: ./containers/rust/Containerfile
           push: true
-          tags: git.plabble.org/job79/go:${{ github.ref_name }}
+          tags: git.plabble.org/maurice/rust:${{ github.ref_name }}
           build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-      - name: Build and push infra container
+      
+      - name: Build and push PHP container
         uses: docker/build-push-action@v5
         with:
-          context: ./containers/infra
-          file: ./containers/infra/Containerfile
+          context: ./containers/php
+          file: ./containers/php/Containerfile
           push: true
-          tags: git.plabble.org/job79/infra:${{ github.ref_name }}
+          tags: git.plabble.org/maurice/php:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+      
+      - name: Build and push C# container
+        uses: docker/build-push-action@v5
+        with:
+          context: ./containers/dotnet
+          file: ./containers/dotnet/Containerfile
+          push: true
+          tags: git.plabble.org/maurice/dotnet:${{ github.ref_name }}
           build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true

.gitea/workflows/kali.yaml

@@ -1,37 +0,0 @@
-name: Build container
-on:
-  push:
-    branches: ["main"]
-    paths:
-      - "containers/kali/**"
-      - ".gitea/workflows/kali.yaml"
-  pull_request:
-    branches: ["main"]
-    paths:
-      - "containers/kali/**"
-      - ".gitea/workflows/kali.yaml"
-  schedule:
-    - cron: "0 16 * * FRI"
-
-jobs:
-  kali-build:
-    runs-on: job-latest
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v4
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build and push kali container
-        uses: docker/build-push-action@v5
-        with:
-          context: ./containers/kali
-          file: ./containers/kali/Containerfile
-          push: true
-          tags: git.plabble.org/job79/kali:${{ github.ref_name }}
-          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true