tqcq/linux-0.12
0
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

[issues6] 增加实验环境中文支持。

Browse Source
This commit is contained in:
ultraji
2020-12-09 00:55:32 +08:00
parent edd141f403
commit 5202224e0f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:latest FROM ubuntu:18.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@@ -14,14 +14,17 @@ RUN apt-get update && apt-get install -y \
git \ git \
sudo \ sudo \
gdb \ gdb \
&& apt-get autoclean \ ttf-wqy-zenhei \
&& locale-gen en_US.UTF-8 && locale-gen en_US.UTF-8 \
&& apt-get autoclean && rm -rf /var/lib/apt/lists/*
# install xfce # install xfce
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y supervisor \ && apt-get install -y \
supervisor \
xfce4 \ xfce4 \
xfce4-terminal xfce4-terminal \
&& apt-get autoclean && rm -rf /var/lib/apt/lists/*
# install tigervnc # install tigervnc
RUN wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-1.8.0.x86_64.tar.gz | tar xz --strip 1 -C / RUN wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-1.8.0.x86_64.tar.gz | tar xz --strip 1 -C /
@@ -40,14 +43,15 @@ RUN (echo "root:123456" | chpasswd) && adduser ${USER} --disabled-password && (e
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential bochs bochs-x bochs-sdl \ build-essential bochs bochs-x bochs-sdl \
make bin86 gcc-multilib make bin86 gcc-multilib \
&& apt-get autoclean && rm -rf /var/lib/apt/lists/*
RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/gcc-3.4-base_3.4.6-6ubuntu3_amd64.deb && dpkg -i gcc-3.4-base_3.4.6-6ubuntu3_amd64.deb || echo RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/gcc-3.4-base_3.4.6-6ubuntu3_amd64.deb && dpkg -i gcc-3.4-base_3.4.6-6ubuntu3_amd64.deb || echo
RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/gcc-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i gcc-3.4_3.4.6-6ubuntu3_amd64.deb || echo RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/gcc-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i gcc-3.4_3.4.6-6ubuntu3_amd64.deb || echo
RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/cpp-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i cpp-3.4_3.4.6-6ubuntu3_amd64.deb || echo RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/cpp-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i cpp-3.4_3.4.6-6ubuntu3_amd64.deb || echo
RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/g++-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i g++-3.4_3.4.6-6ubuntu3_amd64.deb || echo RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/g++-3.4_3.4.6-6ubuntu3_amd64.deb && dpkg -i g++-3.4_3.4.6-6ubuntu3_amd64.deb || echo
RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/libstdc++6-dev_3.4.6-6ubuntu3_amd64.deb && dpkg -i libstdc++6-dev_3.4.6-6ubuntu3_amd64.deb || echo RUN wget -q --show-progress http://mirrors.ustc.edu.cn/ubuntu-old-releases/ubuntu/pool/universe/g/gcc-3.4/libstdc++6-dev_3.4.6-6ubuntu3_amd64.deb && dpkg -i libstdc++6-dev_3.4.6-6ubuntu3_amd64.deb || echo
RUN apt-get install -y -f && rm *.deb RUN apt-get install -y -f && rm *.deb && apt-get autoclean && rm -rf /var/lib/apt/lists/*
ADD conf/vnc_startup.sh ${HOME} ADD conf/vnc_startup.sh ${HOME}
RUN chmod +x ${HOME}/vnc_startup.sh RUN chmod +x ${HOME}/vnc_startup.sh