chore: update Dockerfile and Docker Compose configurations, including adding VNC server and setting Node.js options

build.sh

@@ -24,13 +24,34 @@ export JAVA_HOME=/usr/local/openjdk-11
 # mkdir /workspace/RStudio-container
 export PATH=$PATH:$(go env GOPATH)/bin
 
+# sql
+# SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+
 # nodejs
+export NODE_OPTIONS=--openssl-legacy-provider
+
+yarn config set strict-ssl false
+
 
 # rstudio
 # -e PASSWORD=rstudio
 # docker run --rm -ti -p 8787:8787 -e DISABLE_AUTH=true -e ROOT=true -v /workspace/aa:/workspace/aa  rocker/rstudio:4.4.1
 # docker run --rm -ti rocker/tidyverse R
 
+# php
+# https://github.dev/yiisoft/yii2-docker
+# composer config -g repo.packagist composer  https://mirrors.aliyun.com/composer/
+# composer create-project --prefer-dist yiisoft/yii2-app-basic basic
+
+
+# docker-compose up -d
+# docker-compose ps
+# docker-compose stop xx
+
+# docker-compose kill
+
+# docker-compose run --rm php composer install
+# docker compose exec php bash
 
 # flutter
 export PUB_HOSTED_URL=https://pub.flutter-io.cn
@@ -84,6 +105,7 @@ docker compose  -f "docker-compose.debug.yml" up -d --build node_container
 # docker exec -it java_container /bin/sh
 docker exec -it node_container /bin/bash
 
+# java
 cd /app/qihang.ecom.erp/framework
 mvn package && mvn install
 

docker/vnc/Dockerfile

@@ -0,0 +1,86 @@
+FROM ubuntu:22.04
+# SHELL ["/bin/bash", "-c"]
+
+LABEL email="liuyuqi<liuyuqi.gov@msn.cn>"
+ENV key=value
+WORKDIR /app
+
+# apt change to aliyun
+RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
+RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
+
+RUN apt update && apt install -y curl wget
+
+# COPY .cargo/config ~/.cargo/config
+# COPY .cargo/credentials ~/.cargo/credentials
+
+# install nodejs
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash
+RUN apt install -y nodejs
+RUN echo '\n\
+    registry=http://registry.npm.taobao.org \n\
+    sass_binary_site=https://npmmirror.com/mirrors/node-sass/ \n\
+    electron_mirror=https://npmmirror.com/mirrors/electron/ \n\
+    ELECTRON_BUILDER_BINARIES_MIRROR=https://npmmirror.com/mirrors/electron-builder-binaries/ \n\
+    ' > ~/.npmrc
+RUN npm install -g yarn pnpm serve
+
+# install rust
+# 安装必要依赖与开发工具
+RUN sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
+    apt-get update && apt-get install -y \
+    gcc-riscv64-unknown-elf gdb-multiarch dosfstools cmake \
+    git wget python3 vim file curl \
+    autoconf automake autotools-dev  libmpc-dev libmpfr-dev libgmp-dev \
+    gawk build-essential bison flex texinfo gperf libtool patchutils bc \
+    zlib1g-dev libexpat-dev \
+    ninja-build pkg-config libglib2.0-dev libpixman-1-dev libsdl2-dev
+# && rm -rf /var/lib/apt/lists/*
+
+#tauri deps
+RUN apt install -y libwebkit2gtk-4.0-dev \
+    libssl-dev \
+    libgtk-3-dev \
+    libayatana-appindicator3-dev \
+    librsvg2-dev
+
+# 安装 QEMU
+ARG QEMU_VERSION=7.0.0
+RUN cd /tmp && \
+    wget https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz && \
+    tar xf qemu-${QEMU_VERSION}.tar.xz && \
+    cd qemu-${QEMU_VERSION} && \
+    ./configure --target-list=riscv64-softmmu,riscv64-linux-user && \
+    make -j && \
+    make install && \
+    cd .. && \
+    rm -rf qemu-${QEMU_VERSION} qemu-${QEMU_VERSION}.tar.xz
+
+ARG RUST_VERSION=nightly
+ENV RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
+ENV RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
+
+RUN mkdir -p ~/.cargo && \
+    echo '[source.crates-io]' >> ~/.cargo/config && \
+    echo 'replace-with = "aliyun"' >> ~/.cargo/config && \
+    echo '[source.aliyun]' >> ~/.cargo/config && \
+    echo 'registry = "sparse+https://mirrors.aliyun.com/crates.io-index/"' >> ~/.cargo/config && \
+    echo '[source.ustc]' >> ~/.cargo/config && \
+    echo 'registry = "https://mirrors.ustc.edu.cn/crates.io-index"' >> ~/.cargo/config && \
+    echo '[source.sjtu]' >> ~/.cargo/config && \
+    echo 'registry = "https://mirrors.sjtug.sjtu.edu.cn/git/crates.io-index/"' >> ~/.cargo/config && \
+    echo '[source.tuna]' >> ~/.cargo/config && \
+    echo 'registry = "https://mirrors.tuna.tsinghua.edu.cn/git/crates.io-index.git"' >> ~/.cargo/config && \
+    echo '[source.rustcc]' >> ~/.cargo/config && \
+    echo 'registry = "https://code.aliyun.com/rustcc/crates.io-index.git"' >> ~/.cargo/config
+
+# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable && \
+#     cargo install cargo-binutils && \
+#     rustup component add llvm-tools-preview && \
+#     rustup component add rust-src
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh &&\
+    sh rustup.sh -y --profile minimal &&\
+    PATH=$PATH:/root/.cargo/bin &&\
+    rustup target add riscv32i-unknown-none-elf &&\
+    rustup component add llvm-tools-preview

flutter/.ide/Dockerfile-Allinone-flutter

@@ -8,6 +8,10 @@ RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list.
 RUN apt-get update && apt-get install -y \
     curl zip unzip wget git vim build-essential
 
+# install vnc gui
+RUN apt update && apt install -y xfce4 tightvncserver
+#CMD ["vncserver", ":1"]
+
 # install java
 RUN curl -s "https://get.sdkman.io" | bash
 RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.11-ms"

rust/Dockerfile

@@ -1,154 +1,60 @@
-FROM ubuntu:22.04
-SHELL ["/bin/bash", "-c"]
-
-# 安装必要依赖与开发工具
-RUN sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \
-    gcc-riscv64-unknown-elf gdb-multiarch dosfstools cmake \
-    git wget python3 vim file curl \
-    autoconf automake autotools-dev  libmpc-dev libmpfr-dev libgmp-dev \
-    gawk build-essential bison flex texinfo gperf libtool patchutils bc \
-    zlib1g-dev libexpat-dev \
-    ninja-build pkg-config libglib2.0-dev libpixman-1-dev libsdl2-dev \ 
-    && rm -rf /var/lib/apt/lists/*
-
-# 安装 QEMU
-ARG QEMU_VERSION=7.0.0
-RUN cd /tmp && \
-    wget https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz && \
-    tar xf qemu-${QEMU_VERSION}.tar.xz && \
-    cd qemu-${QEMU_VERSION} && \
-    ./configure --target-list=riscv64-softmmu,riscv64-linux-user && \
-    make -j && \
-    make install && \
-    cd .. && \
-    rm -rf qemu-${QEMU_VERSION} qemu-${QEMU_VERSION}.tar.xz
-
-# 安装 code-server 和扩展
-ARG CODE_VERSION=4.10.1
-RUN cd /usr/local/ && \
-    wget https://github.com/coder/code-server/releases/download/v${CODE_VERSION}/code-server-${CODE_VERSION}-linux-amd64.tar.gz && \
-    tar xf code-server-${CODE_VERSION}-linux-amd64.tar.gz && \
-    ln -s  /usr/local/code-server-${CODE_VERSION}-linux-amd64/bin/code-server /usr/bin/code && \
-    rm code-server-${CODE_VERSION}-linux-amd64.tar.gz && \
-    wget https://openvsxorg.blob.core.windows.net/resources/rust-lang/rust-analyzer/linux-x64/0.3.1435/rust-lang.rust-analyzer-0.3.1435@linux-x64.vsix && \
-    code --install-extension rust-lang.rust-analyzer-0.3.1435@linux-x64.vsix && \
-    rm rust-lang.rust-analyzer-0.3.1435@linux-x64.vsix && \
-    wget https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-zh-hans/1.75.0/file/MS-CEINTL.vscode-language-pack-zh-hans-1.75.0.vsix && \
-    code --install-extension MS-CEINTL.vscode-language-pack-zh-hans-1.75.0.vsix && \
-    rm MS-CEINTL.vscode-language-pack-zh-hans-1.75.0.vsix
-
-WORKDIR /root
-# 安装 rust
-ARG RUST_VERSION=nightly
-ENV RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
-ENV RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
-RUN mkdir .cargo && \
-    echo '[source.crates-io]' >> .cargo/config && \
-    echo 'registry = "https://github.com/rust-lang/crates.io-index"' >> .cargo/config && \
-    echo 'replace-with = "ustc"' >> .cargo/config && \
-    echo '[source.ustc]' >> .cargo/config && \
-    echo 'registry = "git://mirrors.ustc.edu.cn/crates.io-index"' >> .cargo/config && \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init && \
-    chmod +x rustup-init && \
-    ./rustup-init -y --default-toolchain ${RUST_VERSION} --target riscv64imac-unknown-none-elf && \
-    rm rustup-init && \
-    cargo install cargo-binutils && \
-    rustup component add llvm-tools-preview && \
-    rustup component add rust-src
-
-EXPOSE 8080/tcp
-CMD ["code", "--auth", "none", "--bind-addr", "0.0.0.0:8080"]
-
-
-
-
-
-
-FROM ubuntu:22.04
-# SHELL ["/bin/bash", "-c"]
-
-LABEL email="liuyuqi<liuyuqi.gov@msn.cn>"
-ENV key=value
+# jianboy/ubuntu-vnc:latest
+FROM ubuntu:24.04
 WORKDIR /app
-
-# apt change to aliyun
+# apt replace aliyun source
 RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
-RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
-
-RUN apt update && apt install -y curl wget
-
-# COPY .cargo/config ~/.cargo/config
-# COPY .cargo/credentials ~/.cargo/credentials
 
-# install nodejs
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash
-RUN apt install -y nodejs
-RUN echo '\n\
-    registry=http://registry.npm.taobao.org \n\
-    sass_binary_site=https://npmmirror.com/mirrors/node-sass/ \n\
-    electron_mirror=https://npmmirror.com/mirrors/electron/ \n\
-    ELECTRON_BUILDER_BINARIES_MIRROR=https://npmmirror.com/mirrors/electron-builder-binaries/ \n\
-    ' > ~/.npmrc
-RUN npm install -g yarn pnpm serve
-
-# install rust
-# 安装必要依赖与开发工具
-RUN sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \
-    gcc-riscv64-unknown-elf gdb-multiarch dosfstools cmake \
-    git wget python3 vim file curl \
-    autoconf automake autotools-dev  libmpc-dev libmpfr-dev libgmp-dev \
-    gawk build-essential bison flex texinfo gperf libtool patchutils bc \
-    zlib1g-dev libexpat-dev \
-    ninja-build pkg-config libglib2.0-dev libpixman-1-dev libsdl2-dev
+RUN apt update && apt install -y xfce4 tightvncserver xrdp \
+    xfce4-goodies \
+    novnc \
+    x11vnc \
+    wget \
+    curl \
+    firefox \
+    net-tools \
+    xorg \
+    openbox \
+    supervisor
+# && apt-get clean \
 # && rm -rf /var/lib/apt/lists/*
 
-#tauri deps
-RUN apt install -y libwebkit2gtk-4.0-dev \
-    libssl-dev \
-    libgtk-3-dev \
-    libayatana-appindicator3-dev \
-    librsvg2-dev
-
-# 安装 QEMU
-ARG QEMU_VERSION=7.0.0
-RUN cd /tmp && \
-    wget https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz && \
-    tar xf qemu-${QEMU_VERSION}.tar.xz && \
-    cd qemu-${QEMU_VERSION} && \
-    ./configure --target-list=riscv64-softmmu,riscv64-linux-user && \
-    make -j && \
-    make install && \
-    cd .. && \
-    rm -rf qemu-${QEMU_VERSION} qemu-${QEMU_VERSION}.tar.xz
-
-ARG RUST_VERSION=nightly
-ENV RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
-ENV RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
-
-RUN mkdir -p ~/.cargo && \
-    echo '[source.crates-io]' >> ~/.cargo/config && \
-    echo 'replace-with = "aliyun"' >> ~/.cargo/config && \
-    echo '[source.aliyun]' >> ~/.cargo/config && \
-    echo 'registry = "sparse+https://mirrors.aliyun.com/crates.io-index/"' >> ~/.cargo/config && \
-    echo '[source.ustc]' >> ~/.cargo/config && \
-    echo 'registry = "https://mirrors.ustc.edu.cn/crates.io-index"' >> ~/.cargo/config && \
-    echo '[source.sjtu]' >> ~/.cargo/config && \
-    echo 'registry = "https://mirrors.sjtug.sjtu.edu.cn/git/crates.io-index/"' >> ~/.cargo/config && \
-    echo '[source.tuna]' >> ~/.cargo/config && \
-    echo 'registry = "https://mirrors.tuna.tsinghua.edu.cn/git/crates.io-index.git"' >> ~/.cargo/config && \
-    echo '[source.rustcc]' >> ~/.cargo/config && \
-    echo 'registry = "https://code.aliyun.com/rustcc/crates.io-index.git"' >> ~/.cargo/config
+# 安装noVNC
+RUN wget https://github.com/novnc/noVNC/archive/refs/tags/v1.2.0.tar.gz && \
+    tar -xvzf v1.2.0.tar.gz && \
+    mv noVNC-1.2.0 /opt/noVNC
+
+ENV VNC_PASSWORD=123456
+ENV DISPLAY=:0
+
+# 创建启动脚本
+RUN echo '#!/bin/bash\n\
+    x11vnc -storepasswd $VNC_PASSWORD ~/.vnc/passwd\n\
+    # 启动 supervisord\n\
+    exec /usr/bin/supervisord' > /start.sh && \
+    chmod +x /start.sh
+
+# 配置 supervisord 来启动服务
+RUN echo "[supervisord]\nnodaemon=true" > /etc/supervisor/conf.d/supervisord.conf && \
+    echo "[program:x11]\ncommand=startx\n" >> /etc/supervisor/conf.d/supervisord.conf && \
+    echo "[program:x11vnc]\ncommand=x11vnc -display :0 -forever -usepw -create\n" >> /etc/supervisor/conf.d/supervisord.conf && \
+    echo "[program:noVNC]\ncommand=/opt/noVNC/utils/launch.sh --vnc localhost:5900" >> /etc/supervisor/conf.d/supervisord.conf
+
+RUN mkdir -p ~/.vnc
+RUN echo "xfce4-session" > ~/.xsession
+EXPOSE 5900 6080
+# CMD ["vncserver", ":1"]
+# CMD ["/usr/sbin/xrdp", "-n"]
+# CMD ["/usr/bin/supervisord"]
+CMD ["/start.sh"]
+
+# docker build -t jianboy/ubuntu-vnc:latest .
+# docker run -d --rm -v ./:/app -p 3389:3389 -p 5900:5900 -p 6080:6080 -e VNC_PASSWORD=123456 --name ubuntu-vnc aa:latest
+
+# docker exec -it ubuntu-vnc netstat -tuln | grep 5900
+# docker exec -it ubuntu-vnc /opt/noVNC/utils/launch.sh --vnc localhost:5900
+# docker exec -it ubuntu-vnc curl http://localhost:6080
+# docker exec -it ubuntu-vnc bash
+# startxfce4
 
-# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable && \
-#     cargo install cargo-binutils && \
-#     rustup component add llvm-tools-preview && \
-#     rustup component add rust-src
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh &&\
-    sh rustup.sh -y --profile minimal &&\
-    PATH=$PATH:/root/.cargo/bin &&\
-    rustup target add riscv32i-unknown-none-elf &&\
-    rustup component add llvm-tools-preview