first implemenation of buildkit

.gitea/workflows/dev.yaml

@@ -1,35 +1,69 @@
-name: docker-monica-build development
+# name: docker-monica-build development
+
+# on:
+#   push:
+#     branches-ignore:
+#       - main # Läuft auf allen Branches außer `main`
+
+# jobs:
+#   dockerfile_lint:
+#     runs-on: ubuntu-22.04
+#     steps:
+#       - uses: actions/checkout@v4
+#       - uses: hadolint/hadolint-action@v3.1.0
+#         with:
+#           dockerfile: Dockerfile
+
+#   build:
+#     needs: dockerfile_lint
+#     runs-on: ubuntu-22.04
+#     steps:
+#       - uses: actions/checkout@v4
+#       - name: Clean Branch Name
+#         id: clean_branch_name
+#         run: |
+#           CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-')
+#           echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV
+#       - name: Kaniko build
+#         uses: aevea/action-kaniko@v0.12.0
+#         with:
+#           image: rogersik/monica
+#           registry: gitea.sikorski.cloud
+#           tag: "${{ env.CLEAN_BRANCH_NAME }}"
+#           cache: true
+#           username: rogersik
+#           password: ${{ secrets.REGISTRY_PASSWORD }}
+
+name: ci
 
 on:
   push:
-    branches-ignore:
-      - main # Läuft auf allen Branches außer `main`
 
 jobs:
-  dockerfile_lint:
-    runs-on: ubuntu-22.04
+  docker:
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: hadolint/hadolint-action@v3.1.0
+      - name: Login to gitea.sikorski.cloud
+        uses: docker/login-action@v3
         with:
-          dockerfile: Dockerfile
+          registry: gitea.sikorski.cloud
+          username: rogersik
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
-  build:
-    needs: dockerfile_lint
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Clean Branch Name
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create Branch Name as valid tag name
         id: clean_branch_name
         run: |
           CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-')
           echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV
-      - name: Kaniko build
-        uses: aevea/action-kaniko@v0.12.0
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
         with:
-          image: rogersik/monica
-          registry: gitea.sikorski.cloud
-          tag: "${{ env.CLEAN_BRANCH_NAME }}"
-          cache: true
-          username: rogersik
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+          push: true
+          tags: gitea.sikorski.cloud/rogersik/monica:"${{ env.CLEAN_BRANCH_NAME }}"

.gitea/workflows/main.yaml

@@ -1,34 +1,34 @@
-name: docker-monica-build main
-on:
-  push:
-    tags:
-      - '[0-9]+.*'
+# name: docker-monica-build main
+# on:
+#   push:
+#     tags:
+#       - '[0-9]+.*'
 
-jobs:
-  dockerfile_lint:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: Dockerfile
+# jobs:
+#   dockerfile_lint:
+#     runs-on: ubuntu-22.04
+#     steps:
+#       - uses: actions/checkout@v4
+#       - uses: hadolint/hadolint-action@v3.1.0
+#         with:
+#           dockerfile: Dockerfile
 
-  build:
-    needs: dockerfile_lint
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Extract Git Tag
-        id: get_tag
-        run: echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_ENV
-      - name: Kaniko build
-        uses: aevea/action-kaniko@v0.12.0
-        with:
-          image: rogersik/monica
-          registry: gitea.sikorski.cloud
-          tag: '${{ env.TAG }}'
-          cache: true
-          build_args: |
-            GIT_TAG=${{ env.TAG }}
-          username: rogersik
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+#   build:
+#     needs: dockerfile_lint
+#     runs-on: ubuntu-22.04
+#     steps:
+#       - uses: actions/checkout@v4
+#       - name: Extract Git Tag
+#         id: get_tag
+#         run: echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+#       - name: Kaniko build
+#         uses: aevea/action-kaniko@v0.12.0
+#         with:
+#           image: rogersik/monica
+#           registry: gitea.sikorski.cloud
+#           tag: '${{ env.TAG }}'
+#           cache: true
+#           build_args: |
+#             GIT_TAG=${{ env.TAG }}
+#           username: rogersik
+#           password: ${{ secrets.REGISTRY_PASSWORD }}

README.md

@@ -1,8 +1,6 @@
 # monica docker image
 
-Branch: main [![Build Status](https://drone.sikorski.cloud/api/badges/RogerSik/Docker-monica/status.svg?ref=refs/heads/main)](https://drone.sikorski.cloud/RogerSik/Docker-monica)
-
 This images extends
 
 * PHP Upload Limit (50MB)
-* supervisord for Cronjobs like E-Mail notifications
+* supervisord for Cronjobs like E-Mail notifications