浏览代码

Toolchain: Update Dockerfile to ubuntu:21.10

Jelle Raaijmakers 3 年之前
父节点
当前提交
b7bf1a4330
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      Toolchain/Dockerfile

+ 6 - 4
Toolchain/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:21.10
 
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
 
 
@@ -8,6 +8,8 @@ RUN apt-get update -y \
         ccache \
         ccache \
         cmake \
         cmake \
         curl \
         curl \
+        g++-10 \
+        gcc-10 \
         genext2fs \
         genext2fs \
         gettext \
         gettext \
         git \
         git \
@@ -22,9 +24,9 @@ RUN apt-get update -y \
         sudo \
         sudo \
         tzdata \
         tzdata \
         unzip \
         unzip \
-        wget
-RUN apt install gcc-10 g++-10; \
-        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 900 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+        wget \
+    && rm -rf /var/lib/apt/lists/ \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 900 --slave /usr/bin/g++ g++ /usr/bin/g++-10
 
 
 RUN git clone --depth 1 https://github.com/SerenityOS/serenity.git /serenity/serenity-git
 RUN git clone --depth 1 https://github.com/SerenityOS/serenity.git /serenity/serenity-git
 RUN cd /serenity/serenity-git/Toolchain; \
 RUN cd /serenity/serenity-git/Toolchain; \