Merge branch 'Development' of https://git.romainboullard.com/BigfootDev/DockerImages into VulkanSDKUpdate

.gitea/workflows/ci.yaml

@@ -10,7 +10,6 @@ env:
   BRANCH_NAME: ${{ github.ref_name }}
   BASE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbasebuilder
   CPP_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxcppbuilder
-  BIGFOOT_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootbuilder
 
 jobs:
   build-base-builder:
@@ -26,22 +25,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Set up Docker Buildx
+      - name: Build
-        uses: docker/setup-buildx-action@v3
+        run: |
+          docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/BaseBuilder
 
-      - name: Login to the Container registry
+      - name: Login to registry
-        uses: docker/login-action@v3
+        run: |
-        with:
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
-          registry: ${{ vars.DOCKER_REGISTRY }}
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and push base builder
+      - name: Push
-        uses: docker/build-push-action@v5
+        run: |
-        with:
+          docker push ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          context: ./Linux/BaseBuilder
-          push: true
-          tags: ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
 
   build-cpp-builder:
     runs-on: ubuntu-latest
@@ -57,55 +52,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Set up Docker Buildx
+      - name: Build
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push cpp builder
-        uses: docker/build-push-action@v5
-        with:
-          context: ./Linux/CPPBuilder
-          push: true
-          tags: ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          build-args: |
-            BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 360
-    needs: build-cpp-builder
-
-    steps:
-      - name: Set ENV
         run: |
-          echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+          docker build -t ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/CPPBuilder
-          echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
 
-      - name: Checkout
+      - name: Login to registry
-        uses: actions/checkout@v6
+        run: |
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - name: Set up Docker Buildx
+      - name: Push
-        uses: docker/setup-buildx-action@v3
+        run: |
-
+          docker push ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-      - name: Login to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push bigfoot builder
-        uses: docker/build-push-action@v5
-        with:
-          context: ./Linux/BigfootBuilder
-          push: true
-          tags: ${{ env.BIGFOOT_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          build-args: |
-            BASE_BUILDER=${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-            CONAN_RELEASE_PROFILE=clang
-            CONAN_RELWITHDEBINFO_PROFILE=clangd
-            CONAN_DEBUG_PROFILE=clangd

Linux/CPPBuilder/Dockerfile

@@ -6,53 +6,17 @@ FROM $BASE_BUILDER
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
-        # Build tools
         build-essential \
-        gcc \
+        cppcheck \
-        g++ \
+        ccache \
         cmake \
         ninja-build \
-        bison \
-        pkg-config \
         git \
-        ccache \
+        pkg-config \
-        cppcheck \
         wget \
         lsb-release \
         software-properties-common \
         pipx \
-        python-is-python3 \
-        python3-jsonschema \
-        ocaml-core \
-        \
-        # Libraries
-        libglm-dev \
-        libpng-dev \
-        libxml2-dev \
-        liblz4-dev \
-        libzstd-dev \
-        libpciaccess0 \
-        \
-        # X11 / XCB
-        libx11-dev \
-        libx11-xcb-dev \
-        libxcb-dri3-0 \
-        libxcb-dri3-dev \
-        libxcb-present0 \
-        libxcb-keysyms1-dev \
-        libxcb-randr0-dev \
-        libxcb-ewmh-dev \
-        \
-        # Wayland
-        libwayland-dev \
-        wayland-protocols \
-        \
-        # Misc display
-        libxrandr-dev \
-        \
-        # Qt
-        qtbase5-dev \
-        qt6-base-dev \
     && rm -rf /var/lib/apt/lists/*
 
 ENV PATH="/root/.local/bin:${PATH}"