修改ubuntu的构建环境

liuwenru · liuwenru · commit 0083311702bf · 2024-02-20T08:38:46.000+08:00
diff --git a/rockylinux_dev/Dockerfile b/rockylinux_dev/Dockerfile
@@ -2,7 +2,7 @@ FROM rockylinux:9.3.20231119 AS base
 
 RUN dnf install -y dnf-plugins-core && dnf install -y epel-release && dnf config-manager --set-enabled crb
 
-RUN yum -y install openssh openssh-server openssh-clients util-linux-user procps-ng-devel
+RUN yum -y install openssh openssh-server openssh-clients util-linux-user procps-ng-devel fuse-sshfs
 RUN yum -y install vim gcc gcc-c++ perl-Encode* perl-Data-Dumper perl-Text-Unidecode perl-libintl autoconf automake libtool git file bison texinfo ncurses-* make gperf rsync gettext-devel wget patch CUnit-devel net-tools iproute gdb 
 
 
diff --git a/rockylinux_dev/Dockerfile_aarch64 b/rockylinux_dev/Dockerfile_aarch64
@@ -2,7 +2,7 @@ FROM rockylinux:9.3.20231119 AS base
 
 RUN dnf install -y dnf-plugins-core && dnf install -y epel-release && dnf config-manager --set-enabled crb
 
-RUN yum -y install openssh openssh-server openssh-clients util-linux-user procps-ng-devel
+RUN yum -y install openssh openssh-server openssh-clients util-linux-user procps-ng-devel fuse-sshfs
 RUN yum -y install vim gcc gcc-c++ perl-Encode* perl-Data-Dumper perl-Text-Unidecode perl-libintl autoconf automake libtool git file bison texinfo ncurses-* make gperf rsync gettext-devel wget patch CUnit-devel net-tools iproute gdb
 
 
diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile
@@ -7,7 +7,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Asia/Shanghai
 
 RUN apt-get update
-RUN apt-get install -y locales gcc g++ libncurses-dev vim net-tools git curl iftop htop build-essential gdb iproute2 && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+RUN apt-get install -y locales gcc g++ libncurses-dev vim net-tools git curl iftop htop build-essential gdb iproute2 && \ 
+  rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # SSH Install
@@ -51,21 +52,16 @@ RUN go install github.com/ramya-rao-a/go-outline@latest && \
   go install github.com/go-delve/delve/cmd/dlv@latest && \
   go install honnef.co/go/tools/cmd/staticcheck@latest && \
   go install golang.org/x/tools/gopls@latest
+
+FROM golangdev AS nodedev  
 # nvm Install
 RUN bash /opt/devinstaller/nodejsinstaller.sh
 
 FROM nodedev AS pydev
 # python Install
 RUN bash /opt/devinstaller/pyinstaller.sh
 
-# 配置 xvfb和x11vnc 环境
-ENV DISPLAY=":1"
-RUN apt-get install -y x11vnc xvfb firefox gedit-dev xdotool  
-RUN mkdir /root/.vnc && \
-  touch /root/.vnc/passwd && \
-  x11vnc -storepasswd "p@ssw0rd" /root/.vnc/passwd
-
-
+FROM pydev AS javadev
 # 配置 Java开发环境
 RUN bash /opt/devinstaller/javainstaller.sh 
 
diff --git a/ubuntu_dev/build.sh b/ubuntu_dev/build.sh
@@ -6,7 +6,7 @@ fi
 cp -r ../devinstaller ./devinstaller
 
 if [[ $(uname -m) == "x86_64" ]]; then
-  docker build --builder mybuilder --network=host -f Dockerfile --load --target vscodeserver -t liuwenru/ubuntu_dev:$(uname -m) .
+  docker build --no-cache --builder mybuilder --network=host -f Dockerfile --load -t liuwenru/ubuntu_dev:$(uname -m) .
 elif [[ $(uname -m) == "aarch64" ]]; then
   docker build --no-cache --network=host -f Dockerfile_aarch64 -t liuwenru/ubuntu_dev:$(uname -m) .
 fi
