diff --git a/tengine/build/Dockerfile b/tengine/build/Dockerfile index d51bc712f36e5d6e5d0cd785fa677c9067eba548..a26d231f0b9b012eee313182534ce1741e940d10 100644 --- a/tengine/build/Dockerfile +++ b/tengine/build/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. # -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER xt COPY sources.list /etc/apt/sources.list diff --git a/tengine/build/sources.list b/tengine/build/sources.list index 16d92367763d2fda2c6cd9328a56a25b898397ae..82bd9625c805eae98764c57e76f03a3bb323a390 100644 --- a/tengine/build/sources.list +++ b/tengine/build/sources.list @@ -1,19 +1,19 @@ -# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ xenial main restricted -deb-src http://archive.ubuntu.com/ubuntu xenial main restricted #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe -deb http://mirrors.aliyun.com/ubuntu/ xenial multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse #Added by software-properties -deb http://archive.canonical.com/ubuntu xenial partner -deb-src http://archive.canonical.com/ubuntu xenial partner -deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse +# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ bionic main restricted +deb-src http://archive.ubuntu.com/ubuntu bionic main restricted #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates universe +deb http://mirrors.aliyun.com/ubuntu/ bionic multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse #Added by software-properties +deb http://archive.canonical.com/ubuntu bionic partner +deb-src http://archive.canonical.com/ubuntu bionic partner +deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-security universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-security multiverse diff --git a/tengine/nginx/Dockerfile b/tengine/nginx/Dockerfile index d92e4307d291b8ff510b347baf2d367eb5608ecd..3c4381838a822aa43acaef58c9ba5ea8e71b5dbb 100644 --- a/tengine/nginx/Dockerfile +++ b/tengine/nginx/Dockerfile @@ -14,11 +14,11 @@ # limitations under the License. # -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER xt COPY sources.list /etc/apt/sources.list -ADD tengine-2.2.3-bin.tar.gz /usr/local +ADD tengine-2.3.2-bin.tar.gz /usr/local RUN apt-get update && apt-get install -y openssl libjemalloc-dev libpcre3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tengine/nginx/nginx.conf b/tengine/nginx/nginx.conf index 105f90b3605274006a1b1d6b9bd2f50bed8c37d6..6506702a0c8f339ee310c34ea35f5774fed3e6a0 100644 --- a/tengine/nginx/nginx.conf +++ b/tengine/nginx/nginx.conf @@ -50,7 +50,7 @@ http { index index.html; } - location ~.*/index\.html$ { + location ~.*/*\.html$ { root /var/app; add_header Cache-Control "no-cache, no-store, max-age=0, must-revalidate"; } diff --git a/tengine/nginx/sources.list b/tengine/nginx/sources.list index 16d92367763d2fda2c6cd9328a56a25b898397ae..82bd9625c805eae98764c57e76f03a3bb323a390 100644 --- a/tengine/nginx/sources.list +++ b/tengine/nginx/sources.list @@ -1,19 +1,19 @@ -# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ xenial main restricted -deb-src http://archive.ubuntu.com/ubuntu xenial main restricted #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe -deb http://mirrors.aliyun.com/ubuntu/ xenial multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse #Added by software-properties -deb http://archive.canonical.com/ubuntu xenial partner -deb-src http://archive.canonical.com/ubuntu xenial partner -deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse +# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ bionic main restricted +deb-src http://archive.ubuntu.com/ubuntu bionic main restricted #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates universe +deb http://mirrors.aliyun.com/ubuntu/ bionic multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse #Added by software-properties +deb http://archive.canonical.com/ubuntu bionic partner +deb-src http://archive.canonical.com/ubuntu bionic partner +deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-security universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-security multiverse diff --git a/tengine/nginx/tengine-2.2.3-bin.tar.gz b/tengine/nginx/tengine-2.2.3-bin.tar.gz deleted file mode 100644 index cc5c8c391d29158d75af48d219debd4c2dc2257f..0000000000000000000000000000000000000000 Binary files a/tengine/nginx/tengine-2.2.3-bin.tar.gz and /dev/null differ diff --git a/tengine/nginx/tengine-2.3.2-bin.tar.gz b/tengine/nginx/tengine-2.3.2-bin.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3279519ff29c84a84264d65165afb05d1fb16544 Binary files /dev/null and b/tengine/nginx/tengine-2.3.2-bin.tar.gz differ