added flag for build args in Containerfile; flags for 20.04 CI build …

…avoids checking for memory resources
bambulab · Jul 10, 2023 · 4bdb8f0 · 4bdb8f0
1 parent 8a1c618
commit 4bdb8f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -58,7 +58,7 @@ jobs:
         shell: bash
         run: |
           rm -rf build
-          podman buildx build -t bambu-studio-builder:latest .
+          podman buildx build --build-arg BUILD_LINUX_EXTRA_ARGS=-r -t bambu-studio-builder:latest .
           podman run -d -it --name bambu-studio-builder bambu-studio-builder:latest /bin/bash -c 'tail -f /dev/null'
           podman cp bambu-studio-builder:/BambuStudio/build/BambuStudio_ubu64.AppImage ./
           podman stop bambu-studio-builder

diff --git a/Containerfile b/Containerfile
@@ -20,6 +20,7 @@
 
 FROM docker.io/ubuntu:20.04
 LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
+ARG BUILD_LINUX_EXTRA_ARGS=""
 
 # Disable interactive package configuration
 RUN apt-get update && \
@@ -58,14 +59,14 @@ WORKDIR BambuStudio
 
 # These can run together, but we run them seperate for podman caching
 # Update System dependencies
-RUN ./BuildLinux.sh -u
+RUN ./BuildLinux.sh -u ${BUILD_LINUX_EXTRA_ARGS}
 
 # Build dependencies in ./deps
-RUN ./BuildLinux.sh -d
+RUN ./BuildLinux.sh -d ${BUILD_LINUX_EXTRA_ARGS}
 
 # Build slic3r
-RUN ./BuildLinux.sh -s
+RUN ./BuildLinux.sh -s ${BUILD_LINUX_EXTRA_ARGS}
 
 # Build AppImage
 ENV container podman
-RUN ./BuildLinux.sh -i
+RUN ./BuildLinux.sh -i ${BUILD_LINUX_EXTRA_ARGS}