From d27f08dca7099c40ea19c2a4a87009046860b385 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@helloryan.se>
Date: Sat, 8 Mar 2025 22:39:56 +0100
Subject: [PATCH] Add combined-amd64-fedora-41

---
 .gitea/workflows/on-push.yaml       | 16 ++++++++++++++++
 combined-amd64-fedora-41/Dockerfile | 15 +++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 combined-amd64-fedora-41/Dockerfile

diff --git a/.gitea/workflows/on-push.yaml b/.gitea/workflows/on-push.yaml
index 8048fef..253adf3 100644
--- a/.gitea/workflows/on-push.yaml
+++ b/.gitea/workflows/on-push.yaml
@@ -50,3 +50,19 @@ jobs:
         run: docker tag code.helloryan.se/infra/buildenv/node:${{ gitea.sha }} code.helloryan.se/infra/buildenv/node:latest
       - name: Push
         run: docker push code.helloryan.se/infra/buildenv/node:latest
+  infra/buildenv/combined-amd64-fedora-40:
+    runs-on: linux
+    container: code.helloryan.se/infra/misc/docker:latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+      - name: Login
+        run: echo ${{ secrets.INFRA_ACCESS_TOKEN }} | docker login -u act-runner --password-stdin code.helloryan.se
+      - name: Build
+        run: docker buildx build -t code.helloryan.se/infra/buildenv/combined-amd64-fedora-40:${{ gitea.sha }} combined-amd64-fedora-40
+      - name: Test
+        run: docker run --rm code.helloryan.se/infra/buildenv/combined-amd64-fedora-40:${{ gitea.sha }} g++ --version
+      - name: Tag
+        run: docker tag code.helloryan.se/infra/buildenv/combined-amd64-fedora-40:${{ gitea.sha }} code.helloryan.se/infra/buildenv/combined-amd64-fedora-40:latest
+      - name: Push
+        run: docker push code.helloryan.se/infra/buildenv/combined-amd64-fedora-40:latest
diff --git a/combined-amd64-fedora-41/Dockerfile b/combined-amd64-fedora-41/Dockerfile
new file mode 100644
index 0000000..d404ee0
--- /dev/null
+++ b/combined-amd64-fedora-41/Dockerfile
@@ -0,0 +1,15 @@
+FROM fedora:41
+
+RUN true \
+  && dnf -y update \
+  && dnf -y install curl g++ gcc-plugin-devel git make nodejs nodejs openssl wget xxd yarnpkg \
+  && dnf -y install glibc-static libstdc++-static \
+  && dnf clean all
+
+RUN true \
+  && mkdir ~/build2-build \
+  && cd ~/build2-build \
+  && curl -sSfO https://download.build2.org/0.17.0/build2-install-0.17.0.sh \
+  && sh build2-install-0.17.0.sh --yes --trust yes \
+  && cd / \
+  && rm -rf ~/build2-build