diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 5e18cb105..5c7924c28 100644 --- 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 index 4969b3ded..01d658f99 100644 --- a/Containerfile +++ b/Containerfile @@ -20,6 +20,7 @@ FROM docker.io/ubuntu:20.04 LABEL maintainer "DeftDawg " +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}