diff --git a/Dockerfile b/Dockerfile index 8a44f75..fa4acb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 COPY build/java_policy /etc RUN buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev' && \ - apt-get update && apt-get install -y python python3.5 python-pkg-resources python3-pkg-resources $buildDeps && \ + apt-get update && apt-get install -y python python-pkg-resources python3-pkg-resources $buildDeps && \ add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-9 g++-9 && \ rm /usr/bin/gcc /usr/bin/g++ && ln -s /usr/bin/gcc-9 /usr/bin/gcc && ln -s /usr/bin/g++-9 /usr/bin/g++ && \ add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go openjdk-8-jdk && \ diff --git a/Dockerfile-cn b/Dockerfile-cn index c3fd1a9..0b7a4b5 100644 --- a/Dockerfile-cn +++ b/Dockerfile-cn @@ -4,7 +4,7 @@ COPY build/java_policy /etc RUN apt-get update && apt-get install -y wget && wget https://raw.githubusercontent.com/Harry-zklcdc/JudgeServer/master/sources.list && mv sources.list /etc/apt/sources.list && \ buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev' && \ - apt-get update && apt-get install -y python python3.5 python-pkg-resources python3-pkg-resources $buildDeps && \ + apt-get update && apt-get install -y python python-pkg-resources python3-pkg-resources $buildDeps && \ add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-9 g++-9 && \ rm /usr/bin/gcc /usr/bin/g++ && ln -s /usr/bin/gcc-9 /usr/bin/gcc && ln -s /usr/bin/g++-9 /usr/bin/g++ && \ add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go openjdk-8-jdk && \