From 6df4a1bffd0bb7ee7c7fef556082e475d56b4395 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Nov 2024 09:40:31 +0000 Subject: [PATCH] add wasm docker. --- Dockerfiles/ubuntu2204.dockerfile | 12 +++++++++--- Dockerfiles/ubuntu2404.dockerfile | 16 +++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile index eca300f..2f7a0bf 100644 --- a/Dockerfiles/ubuntu2204.dockerfile +++ b/Dockerfiles/ubuntu2204.dockerfile @@ -16,9 +16,8 @@ RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && wget -O - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/openresty.gpg \ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/openresty.gpg] http://openresty.org/package/ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list > /dev/null \ - && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \ && apt update \ - && apt install -y docker-ce-cli openresty nodejs \ + && apt install -y docker-ce-cli openresty \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -47,6 +46,7 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master && sed -i 's/plugins=(.*)/plugins=(git z zsh-autosuggestions zsh-syntax-highlighting)/' /root/.zshrc \ && sed -i 's/^setopt share_history/# setopt share_history/' ~/.oh-my-zsh/lib/history.zsh \ && echo 'setopt no_share_history' >> ~/.oh-my-zsh/lib/history.zsh \ + && echo 'if [ -f /etc/profile ]; then source /etc/profile; fi' >> /etc/zsh/zprofile \ && chsh -s /bin/zsh root RUN cd /root \ @@ -61,6 +61,13 @@ RUN cd /root \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* +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 + 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 \ @@ -74,7 +81,6 @@ RUN cd /root \ && 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/zsh/zshenv \ && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile RUN cd /root \ diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile index 0148f6d..5a3f98b 100644 --- a/Dockerfiles/ubuntu2404.dockerfile +++ b/Dockerfiles/ubuntu2404.dockerfile @@ -15,9 +15,8 @@ RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.l && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && wget -O - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/openresty.gpg \ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/openresty.gpg] http://openresty.org/package/ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list > /dev/null \ - && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \ && apt update \ - && apt install -y docker-ce-cli openresty nodejs \ + && apt install -y docker-ce-cli openresty \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -31,6 +30,9 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master && git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k \ && sed -i 's/ZSH_THEME=".*"/ZSH_THEME="powerlevel10k\/powerlevel10k"/' /root/.zshrc \ && sed -i 's/plugins=(.*)/plugins=(git z zsh-autosuggestions zsh-syntax-highlighting)/' /root/.zshrc \ + && sed -i 's/^setopt share_history/# setopt share_history/' ~/.oh-my-zsh/lib/history.zsh \ + && echo 'setopt no_share_history' >> ~/.oh-my-zsh/lib/history.zsh \ + && echo 'if [ -f /etc/profile ]; then source /etc/profile; fi' >> /etc/zsh/zprofile \ && chsh -s /bin/zsh root RUN git config --global core.quotepath false \ @@ -46,6 +48,13 @@ RUN mkdir /var/run/sshd \ EXPOSE 1022 +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 + 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 \ @@ -59,7 +68,6 @@ RUN cd /root \ && 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/zsh/zshenv \ && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile RUN cd /root \ @@ -69,7 +77,6 @@ RUN cd /root \ && ./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/zsh/zshenv \ && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:$LD_LIBRARY_PATH' >> /etc/profile RUN cd /root \ @@ -115,7 +122,6 @@ 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/zsh/zshenv \ && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && rm -fr /root/ZLMediaKit