diff --git a/DockerRun.sh b/DockerRun.sh index acc93f547..212d9d9e6 100755 --- a/DockerRun.sh +++ b/DockerRun.sh @@ -5,6 +5,16 @@ set -x # -h $HOSTNAME \ # If there's problems with the X display, try this # -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 \ `# Use the hosts networking. Printer wifi and also dbus communication` \ --net=host \ diff --git a/Dockerfile b/Dockerfile index 0d708d632..8d331ae6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,6 @@ RUN apt-get update && apt-get install -y \ extra-cmake-modules \ file \ git \ - ffmpeg \ gstreamer1.0-plugins-bad \ gstreamer1.0-libav \ libcairo2-dev \ @@ -51,7 +50,7 @@ RUN apt-get update && apt-get install -y \ bash \ 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 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 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 # Update System dependencies @@ -80,7 +79,7 @@ RUN ./BuildLinux.sh -d RUN ./BuildLinux.sh -s # Build AppImage -ENV container podman +ENV container=podman RUN ./BuildLinux.sh -i # It's easier to run Bambu Studio as the same username, @@ -96,13 +95,13 @@ ARG USER=root ARG UID=0 ARG GID=0 -# Run the commands with proper bash syntax RUN if [ "$UID" != "0" ]; then \ groupadd -f -g $GID $USER && \ useradd -u $UID -g $GID $USER; \ 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 # accepts several command line arguments.