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

Fix Build Dependency 

Allow latest version to build in Docker.
Latest Revision require ffmpeg 7 to get libvodec61. Which means base image must be updated to ubuntu 24.10
This commit is contained in:
Yike Chen 2024-11-06 19:27:59 -06:00 committed by Lane.Wei
parent 98bfabdd1c
commit c1ff68d2fe
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Dockerfile
View File

@ -1,5 +1,4 @@
FROM docker.io/ubuntu:22.04 FROM docker.io/ubuntu:24.10
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
# Disable interactive package configuration # Disable interactive package configuration
RUN apt-get update && \ RUN apt-get update && \
@ -14,10 +13,13 @@ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
cmake \ cmake \
curl \ curl \
bc \
xvfb \
eglexternalplatform-dev \ eglexternalplatform-dev \
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 \
@ -39,7 +41,6 @@ RUN apt-get update && apt-get install -y \
libssl-dev \ libssl-dev \
libudev-dev \ libudev-dev \
libwayland-dev \ libwayland-dev \
libwebkit2gtk-4.0-dev \
libxkbcommon-dev \ libxkbcommon-dev \
locales \ locales \
locales-all \ locales-all \
@ -47,8 +48,14 @@ RUN apt-get update && apt-get install -y \
pkgconf \ pkgconf \
sudo \ sudo \
wayland-protocols \ wayland-protocols \
bash \
wget wget
#Temporary fix for 24.10 dependency
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
# Change your locale here if you want. See the output # Change your locale here if you want. See the output
# of `locale -a` to pick the correct string formatting. # of `locale -a` to pick the correct string formatting.
ENV LC_ALL=en_US.utf8 ENV LC_ALL=en_US.utf8
@ -81,14 +88,22 @@ RUN ./BuildLinux.sh -i
# your home directory into the container, it's handy # your home directory into the container, it's handy
# to keep permissions the same. Just in case, defaults # to keep permissions the same. Just in case, defaults
# are root. # are root.
# Use bash as the shell
SHELL ["/bin/bash", "-l", "-c"] SHELL ["/bin/bash", "-l", "-c"]
# Set ARG values
ARG USER=root ARG USER=root
ARG UID=0 ARG UID=0
ARG GID=0 ARG GID=0
RUN [[ "$UID" != "0" ]] \
&& groupadd -f -g $GID $USER \ # Run the commands with proper bash syntax
&& useradd -u $UID -g $GID $USER RUN if [ "$UID" != "0" ]; then \
groupadd -f -g $GID $USER && \
useradd -u $UID -g $GID $USER; \
fi
#RUN chmod +x entrypoint.sh
# 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.
ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"] ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"]