From 2a6add8f024bbe60fc2557773dc63fa556c265a3 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Sun, 1 Oct 2023 11:22:22 +0200
Subject: [PATCH] Some cleanup

---
 .github/workflows/build.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 302758f..fac793a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,12 +3,24 @@ on:
   push:
     branches: [ main ]
   workflow_dispatch:
+
+env:
+#  We cannot use env for containers...
+#  https://github.com/actions/runner/issues/2394
+#  CONTAINER: debian:bookworm
+  CONTAINER_NAME: Debian
+  CONTAINER_VERSION: 12
+
 jobs:
   build:
     runs-on: ubuntu-latest
-#    container:
-#     image: debian:bookworm
+    container:
+     image: debian:bookworm
+#     image: ${{ env.CONTAINER }}
     steps:
+      - name: Install container dependencies
+        run: apt-get update -qq && apt -y install git sudo
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -34,16 +46,13 @@ jobs:
           echo "release_version=${version}" >> $GITHUB_OUTPUT
           echo "new_version=${is_new_version}" >> $GITHUB_OUTPUT
 
-#      - name: Install container dependencies
-#        run: apt-get update -qq && apt -y install sudo
-
       - name: Make build scripts executable
         working-directory: build-tools/runtime
         run: chmod +x *
       
       - name: Launch environment.sh
         working-directory: build-tools/runtime
-        run: ./environment.sh "${{ steps.vars.outputs.release_version }}" "Debian" "12"
+        run: ./environment.sh "${{ steps.vars.outputs.release_version }}" ${{ env.CONTAINER_NAME }} ${{ env.CONTAINER_VERSION }}
       
       - name: Launch build.sh
         working-directory: build-tools/runtime