From d57afcc7e314941e4c6535025f44af10ea4a9f0f Mon Sep 17 00:00:00 2001 From: amass Date: Fri, 22 Nov 2024 23:35:59 +0800 Subject: [PATCH] correct docker build. --- Dockerfiles/ubuntu2204.dockerfile | 14 +++++++------- Dockerfiles/ubuntu2404.dockerfile | 19 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile index 2f7a0bf..25cd848 100644 --- a/Dockerfiles/ubuntu2204.dockerfile +++ b/Dockerfiles/ubuntu2204.dockerfile @@ -65,8 +65,8 @@ RUN cd /opt \ && git clone --depth=1 https://github.com/emscripten-core/emsdk.git \ && cd /opt/emsdk \ && ./emsdk install latest \ - && ./emsdk activate latest \ - && echo 'export EMSDK_QUIET=1; source /opt/emsdk/emsdk_env.sh' >> /etc/profile + && ./emsdk activate latest +ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH RUN cd /root \ && apt update \ @@ -80,8 +80,9 @@ RUN cd /root \ && ./configure -prefix /opt/Qt/6.8.0/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \ && cmake --build . --parallel \ && ninja install \ - && rm -fr /root/qt-everywhere-src-6.8.0* \ - && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile + && rm -fr /root/qt-everywhere-src-6.8.0* +ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH +ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH RUN cd /root \ && wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \ @@ -89,8 +90,8 @@ RUN cd /root \ && cd /root/boost_1_86_0 \ && ./bootstrap.sh --prefix=/opt/Libraries/boost_1_86_0 \ && ./b2 install -q --prefix=/opt/Libraries/boost_1_86_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && rm -fr /root/boost_1_86_0* +ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH RUN cd /root \ && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \ @@ -135,10 +136,9 @@ RUN cd /root \ && cmake -G Ninja -B build -S . -DENABLE_OPENSSL=true -DENABLE_WEBRTC=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/opt/Libraries/ZLMediaKit" \ && cmake --build build --target all \ && cmake --install build \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && rm -fr /root/ZLMediaKit +ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH -ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:/opt/Libraries/ZLMediaKit/lib ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 ENV TERM=xterm-256color diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile index 5a3f98b..de06116 100644 --- a/Dockerfiles/ubuntu2404.dockerfile +++ b/Dockerfiles/ubuntu2404.dockerfile @@ -52,9 +52,9 @@ RUN cd /opt \ && git clone --depth=1 https://github.com/emscripten-core/emsdk.git \ && cd /opt/emsdk \ && ./emsdk install latest \ - && ./emsdk activate latest \ - && echo 'export EMSDK_QUIET=1; source /opt/emsdk/emsdk_env.sh' >> /etc/profile - + && ./emsdk activate latest +ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH + RUN cd /root \ && apt update \ && apt install -y libgl1-mesa-dev libfontconfig1-dev libfreetype-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev \ @@ -67,8 +67,9 @@ RUN cd /root \ && ./configure -prefix /opt/Qt/6.8.0/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \ && cmake --build . --parallel \ && ninja install \ - && rm -fr /root/qt-everywhere-src-6.8.0* \ - && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile + && rm -fr /root/qt-everywhere-src-6.8.0* +ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH +ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH RUN cd /root \ && wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \ @@ -76,8 +77,8 @@ RUN cd /root \ && cd /root/boost_1_86_0 \ && ./bootstrap.sh --prefix=/opt/Libraries/boost_1_86_0 \ && ./b2 install -q --prefix=/opt/Libraries/boost_1_86_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \ - && rm -fr /root/boost_1_86_0* \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:$LD_LIBRARY_PATH' >> /etc/profile + && rm -fr /root/boost_1_86_0* +ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH RUN cd /root \ && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \ @@ -122,10 +123,8 @@ RUN cd /root \ && cmake -G Ninja -B build -S . -DENABLE_OPENSSL=true -DENABLE_WEBRTC=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/opt/Libraries/ZLMediaKit" \ && cmake --build build --target all \ && cmake --install build \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && rm -fr /root/ZLMediaKit - -ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:/opt/Libraries/ZLMediaKit/lib:/opt/Qt/6.8.0/gcc_64/lib +ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8