Merge branch 'main' into php84

.gitea/workflows/fedora.yaml

@@ -9,8 +9,6 @@ on:
       - "containers/rust/**"
       - "containers/php/**"
       - ".gitea/workflows/fedora.yaml"
-  pull_request:
-    branches: ["main"]
 
 jobs:
   fedora-build:
@@ -37,15 +35,15 @@ jobs:
           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
+      # - name: Build and push Rust container
-        uses: docker/build-push-action@v5
+      #   uses: docker/build-push-action@v5
-        with:
+      #   with:
-          context: ./containers/rust
+      #     context: ./containers/rust
-          file: ./containers/rust/Containerfile
+      #     file: ./containers/rust/Containerfile
-          push: true
+      #     push: true
-          tags: git.plabble.org/maurice/rust:${{ github.ref_name }}
+      #     tags: git.plabble.org/maurice/rust:${{ github.ref_name }}
-          build-args: TAG=${{ github.ref_name }}
+      #     build-args: TAG=${{ github.ref_name }}
-          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+      #     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
@@ -57,12 +55,12 @@ jobs:
           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
+      # - name: Build and push C# container
-        uses: docker/build-push-action@v5
+      #   uses: docker/build-push-action@v5
-        with:
+      #   with:
-          context: ./containers/dotnet
+      #     context: ./containers/dotnet
-          file: ./containers/dotnet/Containerfile
+      #     file: ./containers/dotnet/Containerfile
-          push: true
+      #     push: true
-          tags: git.plabble.org/maurice/dotnet:${{ github.ref_name }}
+      #     tags: git.plabble.org/maurice/dotnet:${{ github.ref_name }}
-          build-args: TAG=${{ github.ref_name }}
+      #     build-args: TAG=${{ github.ref_name }}
-          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+      #     outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true

.gitea/workflows/other.yaml

@@ -37,12 +37,12 @@ jobs:
           build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
 
-      # - name: Build and push Flutter container
+      - name: Build and push Flutter container
-      #   uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v5
-      #   with:
+        with:
-      #     context: ./containers/flutter
+          context: ./containers/flutter
-      #     file: ./containers/flutter/Containerfile
+          file: ./containers/flutter/Containerfile
-      #     push: true
+          push: true
-      #     tags: git.plabble.org/maurice/flutter:${{ github.ref_name }}
+          tags: git.plabble.org/maurice/flutter:${{ github.ref_name }}
-      #     build-args: TAG=${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
-      #     outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true

containers/dotnet/Containerfile

@@ -1,7 +1,7 @@
 FROM git.plabble.org/maurice/fedora:main
 
 USER root
-RUN dnf -y install dotnet-sdk-9.0 dotnet-sdk-10.0
+RUN dnf -y install dotnet-sdk-9.0
 
 COPY install-roslyn.sh /tmp/install-roslyn.sh
 RUN chmod +x /tmp/install-roslyn.sh && /tmp/install-roslyn.sh

containers/fedora/Containerfile

@@ -2,6 +2,7 @@ FROM quay.io/fedora/fedora:43
 
 # === install system packages ===
 RUN dnf update -y && \
+  dnf copr enable -y atim/lazygit && \
   dnf -y install procps ping bash-completion glibc-langpack-en \
     host-spawn dbus-launch \
     git pnpm helix zip 

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,5 +1,5 @@
 FROM git.plabble.org/maurice/dotnet:main
-ARG rider_version="2025.3.0.3"
+ARG rider_version="2025.2.4"
 ARG download_uri="https://download.jetbrains.com/rider/JetBrains.Rider-${rider_version}.tar.gz"
 
 USER root