mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added flag for build args in Containerfile; flags for 20.04 CI build avoids checking for memory resources

This commit is contained in:
Abhijit Majumdar 2023-07-07 10:10:06 -05:00 committed by Lane.Wei
parent 8a1c618106
commit 4bdb8f0724
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_ubuntu.yml vendored
View File

@ -58,7 +58,7 @@ jobs:
shell: bash shell: bash
run: | run: |
rm -rf build 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 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 cp bambu-studio-builder:/BambuStudio/build/BambuStudio_ubu64.AppImage ./
podman stop bambu-studio-builder podman stop bambu-studio-builder

9
Containerfile
View File

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