amass/Older
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add env to env.
Some checks are pending
Deploy Docker Images / Build dockerfile and Server deploy (push) Has started running
Details

Browse Source
This commit is contained in:
amass 2024-11-23 04:44:59 +08:00
parent 54e9479d05
commit b7296c7c30
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfiles/ubuntu2204.dockerfile
View File

@ -65,7 +65,8 @@ RUN cd /opt \
&& git clone --depth=1 https://github.com/emscripten-core/emsdk.git \ && git clone --depth=1 https://github.com/emscripten-core/emsdk.git \
&& cd /opt/emsdk \ && cd /opt/emsdk \
&& ./emsdk install latest \ && ./emsdk install latest \
&& ./emsdk activate latest && ./emsdk activate latest \
&& echo 'export PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH' >> /etc/profile
ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH
RUN cd /root \ RUN cd /root \
@ -80,7 +81,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 \ && ./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 \ && cmake --build . --parallel \
&& ninja install \ && ninja install \
&& rm -fr /root/qt-everywhere-src-6.8.0* && rm -fr /root/qt-everywhere-src-6.8.0* \
&& echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile \
&& echo 'export LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile
ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH 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 ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH
@ -90,7 +93,8 @@ RUN cd /root \
&& cd /root/boost_1_86_0 \ && cd /root/boost_1_86_0 \
&& ./bootstrap.sh --prefix=/opt/Libraries/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 \ && ./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* && rm -fr /root/boost_1_86_0* \
&& echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH' >> /etc/profile
ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH
RUN cd /root \ RUN cd /root \
@ -136,7 +140,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 -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 --build build --target all \
&& cmake --install build \ && cmake --install build \
&& rm -fr /root/ZLMediaKit && rm -fr /root/ZLMediaKit \
&& echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile
ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8

13
Dockerfiles/ubuntu2404.dockerfile
View File

@ -52,7 +52,8 @@ RUN cd /opt \
&& git clone --depth=1 https://github.com/emscripten-core/emsdk.git \ && git clone --depth=1 https://github.com/emscripten-core/emsdk.git \
&& cd /opt/emsdk \ && cd /opt/emsdk \
&& ./emsdk install latest \ && ./emsdk install latest \
&& ./emsdk activate latest && ./emsdk activate latest \
&& echo 'export PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH' >> /etc/profile
ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH
RUN cd /root \ RUN cd /root \
@ -67,7 +68,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 \ && ./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 \ && cmake --build . --parallel \
&& ninja install \ && ninja install \
&& rm -fr /root/qt-everywhere-src-6.8.0* && rm -fr /root/qt-everywhere-src-6.8.0* \
&& echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile \
&& echo 'export LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile
ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH 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 ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH
@ -77,7 +80,8 @@ RUN cd /root \
&& cd /root/boost_1_86_0 \ && cd /root/boost_1_86_0 \
&& ./bootstrap.sh --prefix=/opt/Libraries/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 \ && ./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* && rm -fr /root/boost_1_86_0* \
&& echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH' >> /etc/profile
ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:LD_LIBRARY_PATH
RUN cd /root \ RUN cd /root \
@ -123,7 +127,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 -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 --build build --target all \
&& cmake --install build \ && cmake --install build \
&& rm -fr /root/ZLMediaKit && rm -fr /root/ZLMediaKit \
&& echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile
ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8

2
resources/build.sh
View File

@ -113,7 +113,7 @@ function build_docker_images(){
function lvgl(){ function lvgl(){
rm ${build_path}/LvglApplication/lvglapp.html rm ${build_path}/LvglApplication/lvglapp.html
emcmake cmake -DSDL2_DIR=/home/amass/emsdk/upstream/emscripten/system/lib/cmake/SDL2 -S LvglApplication -B ${build_path}/LvglApplication emcmake cmake -G Ninja -DSDL2_DIR=/home/amass/emsdk/upstream/emscripten/system/lib/cmake/SDL2 -S LvglApplication -B ${build_path}/LvglApplication
cmake --build ${build_path}/LvglApplication --target all cmake --build ${build_path}/LvglApplication --target all
# python3 -m http.server -d ./build/LvglApplication # python3 -m http.server -d ./build/LvglApplication
} }