diff --git a/web/Dockerfile b/web/Dockerfile index b7939c2..a0817b8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 ARG CLONE_ADDFLAG diff --git a/web/install.sh b/web/install.sh index 2f41571..8f041b2 100644 --- a/web/install.sh +++ b/web/install.sh @@ -14,7 +14,7 @@ getAptPackage(){ export DEBIAN_FRONTEND=noninteractive dpkg -s gnupg 2>/dev/null || (apt-get update && apt-get install -y gnupg) echo "deb http://ppa.launchpad.net/stesie/libv8/ubuntu bionic main" | tee /etc/apt/sources.list.d/stesie-libv8.list && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D858A0DF - apt-get update && apt-get install -y vim ntp zip unzip curl wget apache2 libapache2-mod-xsendfile libapache2-mod-php php php-dev php-pear php-zip php-mysql php-mbstring php-gd php-intl php-xsl g++ cmake re2c libv8-7.5-dev libyaml-dev + apt-get update && apt-get install -y vim ntp zip unzip curl wget apache2 libapache2-mod-xsendfile libapache2-mod-php php php-dev php-pear php-zip php-mysql php-mbstring php-gd php-intl php-xsl g++ make re2c libv8-7.5-dev libyaml-dev # Install PHP extensions printf "/opt/libv8-7.5\n\n" | pecl install v8js yaml } @@ -62,14 +62,14 @@ setWebConf(){ file_put_contents('/var/www/uoj/app/.config.php', "include/uoj_work_path.h <