fix dockerfile

KumaTea · Dec 15, 2020 · f893a0d · f893a0d
1 parent 68c89e8
commit f893a0d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/build/py36/Dockerfile b/build/py36/Dockerfile
@@ -6,17 +6,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
         \
         && echo "cd /root" >> /root/.bashrc \
-        && cd /root \
         && apt update \
-        && apt install -y bash build-essential ca-certificates cmake curl git libjpeg-dev libpng-dev libssl-dev nano screen wget xz-utils zlib1g-dev
+        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano wget xz-utils zlib1g-dev
 
 RUN set -xe \
         \
+        && cd /root \
         && wget -q https://www.python.org/ftp/python/3.6.12/Python-3.6.12.tar.xz -O /root/py36.tar.xz \
         && tar -xJf /root/py36.tar.xz \
         && rm /root/py36.tar.xz \
         && cd /root/Python-3.6.12 \
-        && ./configure \
+        && ./configure --enable-optimizations \
         && make \
         && make install \
         && cd /root \
@@ -25,7 +25,7 @@ RUN set -xe \
 RUN set -xe \
         \
         && python3.6 -m pip install -U pip setuptools wheel \
-        && python3.6 -m pip install -U dataclasses future ninja numpy pillow pyyaml requests six typing_extensions \
+        && python3.6 -m pip install -U cffi dataclasses future ninja numpy pillow pyyaml requests six typing_extensions \
         && rm -rf /root/.cache/*
 
 # COPY . .

diff --git a/build/py37/Dockerfile b/build/py37/Dockerfile
@@ -6,17 +6,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
         \
         && echo "cd /root" >> /root/.bashrc \
-        && cd /root \
         && apt update \
-        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano screen wget xz-utils zlib1g-dev
+        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano wget xz-utils zlib1g-dev
 
 RUN set -xe \
         \
+        && cd /root \
         && wget -q https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tar.xz -O /root/py37.tar.xz \
         && tar -xJf /root/py37.tar.xz \
         && rm /root/py37.tar.xz \
         && cd /root/Python-3.7.9 \
-        && ./configure \
+        && ./configure --enable-optimizations \
         && make \
         && make install \
         && cd /root \

diff --git a/build/py38/Dockerfile b/build/py38/Dockerfile
@@ -6,13 +6,15 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
         \
         && echo "cd /root" >> /root/.bashrc \
-        && cd /root \
         && apt update \
-        && apt install -y bash build-essential ca-certificates cmake curl git libssl-dev nano python3-cffi python3-dev python3-future python3-numpy python3-pil python3-pip python3-requests python3-setuptools python3-six python3-wheel python3-yaml screen xz-utils wget zlib1g-dev
+        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano wget xz-utils zlib1g-dev
 
 RUN set -xe \
         \
-        && python3 -m pip install -U dataclasses ninja pip pyyaml typing_extensions \
+        && cd /root \
+        && apt install -y bash python3-cffi python3-dev python3-future python3-numpy python3-pil python3-pip python3-requests python3-setuptools python3-six python3-wheel python3-yaml \
+        && python3 -m pip install -U pip setuptools wheel \
+        && python3 -m pip install -U dataclasses ninja pyyaml typing_extensions \
         && rm -rf /root/.cache/*
 
 # COPY . .

diff --git a/build/py39/Dockerfile b/build/py39/Dockerfile
@@ -6,17 +6,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
         \
         && echo "cd /root" >> /root/.bashrc \
-        && cd /root \
         && apt update \
-        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano screen wget xz-utils zlib1g-dev
+        && apt install -y bash build-essential ca-certificates cmake curl git libffi-dev libssl-dev nano wget xz-utils zlib1g-dev
 
 RUN set -xe \
         \
+        && cd /root \
         && wget -q https://www.python.org/ftp/python/3.9.1/Python-3.9.1.tar.xz -O /root/py39.tar.xz \
         && tar -xJf /root/py39.tar.xz \
         && rm /root/py39.tar.xz \
         && cd /root/Python-3.9.1 \
-        && ./configure \
+        && ./configure --enable-optimizations \
         && make \
         && make install \
         && cd /root \