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

modify docker file to point ffmpeg to binary at build time, as well as update a couple deprecated docker syntax. Also added more troubleshooting recommendations to DockerRun.sh

This commit is contained in:
PatrickChenHZ 2024-11-30 13:43:14 -06:00 committed by Lane.Wei
parent c1ff68d2fe
commit acb47e37fc
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DockerRun.sh
View File

@ -5,6 +5,16 @@ set -x
# -h $HOSTNAME \ # -h $HOSTNAME \
# If there's problems with the X display, try this # If there's problems with the X display, try this
# -v /tmp/.X11-unix:/tmp/.X11-unix \ # -v /tmp/.X11-unix:/tmp/.X11-unix \
# or
# -v $HOME/.Xauthority:/root/.Xauthority
# You also need to run "xhost +" on your host system
# Bambu Studio also require the parent directory for the configuration directory to be present to start
# which means it is important to make sure user is passed to container correctly
# if the following configuration does not work with error: "boost::filesystem::create_directory: No such file or directory"
# try replacing -u line with
# -u $(id -u ${USER}):$(id -g ${USER}) \
# and add
# -e HOME=/home/$USER \
docker run \ docker run \
`# Use the hosts networking. Printer wifi and also dbus communication` \ `# Use the hosts networking. Printer wifi and also dbus communication` \
--net=host \ --net=host \

13
Dockerfile
View File

@ -19,7 +19,6 @@ RUN apt-get update && apt-get install -y \
extra-cmake-modules \ extra-cmake-modules \
file \ file \
git \ git \
ffmpeg \
gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-bad \
gstreamer1.0-libav \ gstreamer1.0-libav \
libcairo2-dev \ libcairo2-dev \
@ -51,7 +50,7 @@ RUN apt-get update && apt-get install -y \
bash \ bash \
wget wget
#Temporary fix for 24.10 dependency #Temporary fix for 24.10 dependency, 24.10 still required for ffmpeg7 to run Bug-free
RUN echo 'deb http://gb.archive.ubuntu.com/ubuntu jammy main' >> /etc/apt/sources.list RUN echo 'deb http://gb.archive.ubuntu.com/ubuntu jammy main' >> /etc/apt/sources.list
RUN apt-get update && apt-get install -y libwebkit2gtk-4.0-dev RUN apt-get update && apt-get install -y libwebkit2gtk-4.0-dev
@ -65,9 +64,9 @@ RUN locale-gen $LC_ALL
# the CA cert path on every startup # the CA cert path on every startup
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
COPY ./ BambuStudio COPY ./ /BambuStudio
WORKDIR BambuStudio 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
@ -80,7 +79,7 @@ RUN ./BuildLinux.sh -d
RUN ./BuildLinux.sh -s RUN ./BuildLinux.sh -s
# Build AppImage # Build AppImage
ENV container podman ENV container=podman
RUN ./BuildLinux.sh -i RUN ./BuildLinux.sh -i
# It's easier to run Bambu Studio as the same username, # It's easier to run Bambu Studio as the same username,
@ -96,13 +95,13 @@ ARG USER=root
ARG UID=0 ARG UID=0
ARG GID=0 ARG GID=0
# Run the commands with proper bash syntax
RUN if [ "$UID" != "0" ]; then \ RUN if [ "$UID" != "0" ]; then \
groupadd -f -g $GID $USER && \ groupadd -f -g $GID $USER && \
useradd -u $UID -g $GID $USER; \ useradd -u $UID -g $GID $USER; \
fi fi
#RUN chmod +x entrypoint.sh # Point FFMPEG Library search to the binary built upon BambuStudio build time
ENV LD_LIBRARY_PATH=/BambuStudio/build/package/bin
# Using an entrypoint instead of CMD because the binary # Using an entrypoint instead of CMD because the binary
# accepts several command line arguments. # accepts several command line arguments.