Merge branch 'main' into php84

.gitea/workflows/build.yaml

@@ -1,111 +0,0 @@
-name: Build containers
-on:
-  workflow_dispatch:
-  push:
-    branches: ["main"]
-    paths: ["containers/**", ".gitea/workflows/build.yaml"]
-  pull_request:
-    branches: ["main"]
-    paths: ["containers/**", ".gitea/workflows/build.yaml"]
-
-jobs:
-  changes:
-    runs-on: job-v2
-    outputs:
-      any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
-      fedora: ${{ steps.filter.outputs.fedora == 'true' }}
-      php: ${{ steps.filter.outputs.php == 'true' }}
-      rust: ${{ steps.filter.outputs.rust == 'true' }}
-      dotnet: ${{ steps.filter.outputs.dotnet == 'true' }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: https://github.com/dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            workflow: ['.gitea/workflows/build.yaml']
-            fedora: ['containers/fedora/**']
-            php: ['containers/php/**']
-            rust: ['containers/rust/**']
-            dotnet: ['containers/dotnet/**']
-
-  base-image:
-    needs: [changes]
-    if: ${{ needs.changes.outputs.fedora == 'true' || needs.changes.outputs.any_change == 'true' }}
-    runs-on: job-v2
-    steps:
-      - uses: actions/checkout@v4
-      - name: Log in
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build
-        id: build
-        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
-        with:
-          image: maurice/fedora
-          tags: ${{ github.ref_name }}
-          context: ./containers/fedora
-          containerfiles: ./containers/fedora/Containerfile
-      - name: Push
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build.outputs.image }}
-          tags: ${{ steps.build.outputs.tags }}
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-          extra-args: |
-            --compression-format=zstd
-            --compression-level=12
-
-  dependent-images:
-    needs: [changes, base-image]
-    if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped')
-    runs-on: job-v2
-    strategy:
-      fail-fast: false
-      matrix:
-        container: [php, rust, dotnet]
-    steps:
-      - name: Check if build needed
-        id: check
-        run: |
-          if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "rust" && "${{ needs.changes.outputs.rust }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "dotnet" && "${{ needs.changes.outputs.dotnet }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-      - name: Clone repo
-        if: steps.check.outputs.run == 'true'
-        uses: actions/checkout@v4
-      - name: Log in
-        if: steps.check.outputs.run == 'true'
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build
-        id: build
-        if: steps.check.outputs.run == 'true'
-        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
-        with:
-          image: maurice/${{ matrix.container }}
-          tags: ${{ github.ref_name }}
-          context: ./containers/${{ matrix.container }}
-          containerfiles: ./containers/${{ matrix.container }}/Containerfile
-          build-args: TAG=${{ github.ref_name }}
-      - name: Push
-        if: steps.check.outputs.run == 'true'
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build.outputs.image }}
-          tags: ${{ steps.build.outputs.tags }}
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-          extra-args: |
-            --compression-format=zstd
-            --compression-level=12

.gitea/workflows/fedora.yaml

@@ -0,0 +1,68 @@
+name: Build container
+on:
+  workflow_dispatch:  # This makes the workflow manually triggered
+  push:
+    branches: ["main"]
+    paths:
+      - "containers/fedora/**"
+      - "containers/dotnet/**"
+      - "containers/rust/**"
+      - "containers/php/**"
+      - ".gitea/workflows/fedora.yaml"
+  pull_request:
+    branches: ["main"]
+    
+jobs:
+  fedora-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 Fedora container
+        uses: docker/build-push-action@v5
+        with:
+          context: ./containers/fedora
+          file: ./containers/fedora/Containerfile
+          push: true
+          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 Rust container
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     context: ./containers/rust
+      #     file: ./containers/rust/Containerfile
+      #     push: true
+      #     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 PHP container
+        uses: docker/build-push-action@v5
+        with:
+          context: ./containers/php
+          file: ./containers/php/Containerfile
+          push: true
+          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/other.yaml

@@ -1,40 +1,48 @@
 name: Build optional dev containers
 on:
-  workflow_dispatch:
+  workflow_dispatch:  # This makes the workflow manually triggered
 
 jobs:
   fedora-build:
-    runs-on: job-v2
+    runs-on: job-latest
-    strategy:
-      max-parallel: 1
-      matrix:
-        container: [rider, android]
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
-      - name: Log in
+      - name: Setup Docker Buildx
-        uses: redhat-actions/podman-login@v1
+        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 ${{ matrix.container }} container
+
-        id: build_image
+      - name: Build and push Rider container
-        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
+        uses: docker/build-push-action@v5
         with:
-          image: maurice/${{ matrix.container }}
+          context: ./containers/rider
-          tags: ${{ github.ref_name }}
+          file: ./containers/rider/Containerfile
-          context: ./containers/${{ matrix.container }}
+          push: true
-          containerfiles: ./containers/${{ matrix.container }}/Containerfile
+          tags: git.plabble.org/maurice/rider:${{ github.ref_name }}
           build-args: TAG=${{ github.ref_name }}
-      - name: Push ${{ matrix.container }} container
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-        uses: redhat-actions/push-to-registry@v2
+
+      - name: Build and push Android Studio container
+        uses: docker/build-push-action@v5
         with:
-          image: ${{ steps.build_image.outputs.image }}
+          context: ./containers/android
-          tags: ${{ steps.build_image.outputs.tags }}
+          file: ./containers/android/Containerfile
-          registry: git.plabble.org
+          push: true
-          username: ${{ secrets.REGISTRY_USERNAME }}
+          tags: git.plabble.org/maurice/android:${{ github.ref_name }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
+          build-args: TAG=${{ github.ref_name }}
-          extra-args: |
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-            --compression-format=zstd
+
-            --compression-level=12
+      - name: Build and push Flutter container
+        uses: docker/build-push-action@v5
+        with:
+          context: ./containers/flutter
+          file: ./containers/flutter/Containerfile
+          push: true
+          tags: git.plabble.org/maurice/flutter:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true

containers/android/Containerfile

@@ -3,9 +3,7 @@ ARG studio_version="2025.1.4.8"
 ARG download_uri="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${studio_version}/android-studio-${studio_version}-linux.tar.gz"
 
 USER root
-
+RUN dnf -y install libXext libXrender libXtst libX11 freetype freetype-devel mesa-libGLU
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel mesa-libGLU
 USER user
 
 RUN curl -Lo /tmp/studio.tar.gz "${download_uri}" && \

containers/dotnet/Containerfile

@@ -1,8 +1,7 @@
 FROM git.plabble.org/maurice/fedora:main
 
 USER root
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+RUN dnf -y install dotnet-sdk-9.0
-  dnf -y --setopt=keepcache=1 install dotnet-sdk-9.0 dotnet-sdk-10.0
 
 COPY install-roslyn.sh /tmp/install-roslyn.sh
 RUN chmod +x /tmp/install-roslyn.sh && /tmp/install-roslyn.sh

containers/dotnet/install-roslyn.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-version="v1.39.15"
+version="v1.39.15-beta.60"
 arch="linux-x64"
 link="https://github.com/OmniSharp/omnisharp-roslyn/releases/download/$version/omnisharp-$arch-net6.0.tar.gz"
 

containers/fedora/Containerfile

@@ -1,11 +1,11 @@
 FROM quay.io/fedora/fedora:43
 
 # === install system packages ===
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+RUN dnf update -y && \
-  dnf update -y && \
+  dnf copr enable -y atim/lazygit && \
-  dnf -y --setopt=keepcache=1 install procps ping bash-completion glibc-langpack-en \
+  dnf -y install procps ping bash-completion glibc-langpack-en \
     host-spawn dbus-launch \
-    git pnpm helix zip rsync
+    git pnpm helix zip 
 
 # === setup user ===
 RUN useradd -ms /bin/bash user && \

containers/fedora/config.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-arg "-p 5173:5173 --network dev-php"
+arg "-p 8080:8080"

containers/php/Containerfile

@@ -1,4 +1,4 @@
 FROM git.plabble.org/maurice/fedora:main
-ARG php_version="8.5"
+ARG php_version="8.4"
 
 RUN /bin/bash -c "export TERM=xterm && $(curl -fsSL https://php.new/install/linux/${php_version})"

containers/rider/Containerfile

@@ -1,10 +1,9 @@
 FROM git.plabble.org/maurice/dotnet:main
-ARG rider_version="2025.3.2"
+ARG rider_version="2025.2.4"
 ARG download_uri="https://download.jetbrains.com/rider/JetBrains.Rider-${rider_version}.tar.gz"
 
 USER root
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+RUN dnf -y install libXext libXrender libXtst libX11 freetype freetype-devel
-  dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel
 USER user
 
 RUN curl -Lo /tmp/rider.tar.gz "${download_uri}" && \

containers/rust/Containerfile

@@ -2,11 +2,3 @@ FROM git.plabble.org/maurice/fedora:main
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN . '/home/user/.cargo/env' && rustup component add rust-analyzer
-
-# Raspberry Pi Pico tools
-RUN sudo dnf install -y \
-    systemd-devel \
-    pkg-config \
- && dnf clean all
-RUN . "$HOME/.cargo/env" && cargo install elf2uf2-rs --locked
-RUN . "$HOME/.cargo/env" && rustup target add thumbv6m-none-eabi