From dd339077ee47f0db717b32cdca5316ba0ca73a41 Mon Sep 17 00:00:00 2001
From: Tom Noogen <tom@noogen.net>
Date: Fri, 29 Jun 2018 10:07:04 -0500
Subject: [PATCH 1/2] update nginx

---
 Dockerfile | 6 +++---
 README.md  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f3c2a2d..cd5f847 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     GOLANG_VERSION=1.10.3 \
     NGINX_BUILD_DIR=/usr/src/nginx \
     NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.31 \
-    NGINX_VERSION=1.13.12 \
+    NGINX_VERSION=1.14.0 \
     NGINX_PAGESPEED_VERSION=1.13.35.2 \
     NGINX_PSOL_VERSION=1.13.35.2 \
     IMAGE_FILTER_URL=https://raw.githubusercontent.com/niiknow/docker-nginx-image-proxy/master/build/src/ngx_http_image_filter_module.c
@@ -40,8 +40,8 @@ RUN \
     && rm ngx-misc.tar.gz \
     && curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - \
     && cp /etc/apt/sources.list /etc/apt/sources.list.bak \
-    && echo "deb http://nginx.org/packages/mainline/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
-    && echo "deb-src http://nginx.org/packages/mainline/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
+    && echo "deb http://nginx.org/packages/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
+    && echo "deb-src http://nginx.org/packages/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
     && apt-get update && apt-get -y --no-install-recommends upgrade \
     && apt-get install -y --no-install-recommends libpcre3-dev libssl-dev dpkg-dev libgd-dev iproute uuid-dev \
     && mkdir -p ${NGINX_BUILD_DIR} \
diff --git a/README.md b/README.md
index 5830ff1..ab0cda1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 The ultimate control panel with docker (thanks lagun4ik for a great start)
 
 What's included?
-* ubuntu 16.04 lts + Vesta 0.9.8-20
+* ubuntu 16.04 lts + Vesta 0.9.8-22
 * nginx (proxy) -> apache2 -> php-fcgi - high performance and flexible implementation
 * added ability to also run php-fpm
 * ssh/sftp, letsencrypt, memcached, redis, MariaDB 10.2, postgresql 9.6, nodejs 8.x, golang 1.10, openvpn, mongodb, couchdb, .net core 2.0 runtime
@@ -74,6 +74,8 @@ If you use this Docker for hosting and allow your user to login, I also recommen
 Enjoy!!!
 
 ## Release Notes
+1.3.6 - update nginx to 1.14 stable release
+1.3.5 - update to 0.9.8-22
 1.3.3 - update to 0.9.8-20
 
 1.3.1 - upgrade documentation.  

From 78f963257faa950f5ae01533724fadc379c2e15e Mon Sep 17 00:00:00 2001
From: Tom Noogen <tom@noogen.net>
Date: Fri, 29 Jun 2018 11:07:13 -0500
Subject: [PATCH 2/2] update dotnet

---
 Dockerfile                                | 2 +-
 README.md                                 | 6 ++++--
 rootfs/sysprepz/admin/bin/vesta-update.sh | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd5f847..7152937 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -136,7 +136,7 @@ RUN \
 
 # install nodejs, memcached, redis-server, openvpn, mongodb, dotnet-sdk, and couchdb
     && apt-get install -yf --no-install-recommends nodejs memcached php-memcached redis-server \
-        openvpn mongodb-org php-mongodb couchdb dotnet-sdk-2.1.103 \
+        openvpn mongodb-org php-mongodb couchdb dotnet-sdk-2.1.200 \
 
 # setting upawscli, golang
 # awscli
diff --git a/README.md b/README.md
index ab0cda1..b35d887 100644
--- a/README.md
+++ b/README.md
@@ -74,8 +74,10 @@ If you use this Docker for hosting and allow your user to login, I also recommen
 Enjoy!!!
 
 ## Release Notes
-1.3.6 - update nginx to 1.14 stable release
-1.3.5 - update to 0.9.8-22
+1.3.6 - update nginx to 1.14 stable release, update dotnet
+
+1.3.5 - update to 0.9.8-22 - REMINDER: if your server has not autoupdate to 0.9.8-22, please do so or update to this release.  There is a serious security issue in 0.9.8-20.
+
 1.3.3 - update to 0.9.8-20
 
 1.3.1 - upgrade documentation.  
diff --git a/rootfs/sysprepz/admin/bin/vesta-update.sh b/rootfs/sysprepz/admin/bin/vesta-update.sh
index c3406a8..39dd826 100755
--- a/rootfs/sysprepz/admin/bin/vesta-update.sh
+++ b/rootfs/sysprepz/admin/bin/vesta-update.sh
@@ -16,3 +16,7 @@ if [ ! -d "/var/lib/postgresql/9.6/" ]; then
     rsync --update -raz /vesta-start/var/lib/postgresql/9.6/* /vesta/var/lib/postgresql/9.6
     rsync --update -raz /vesta-start/etc/postgresql/9.6/* /vesta/etc/postgresql/9.6
 fi
+
+# restart vesta after update
+rm -f /var/run/vesta-php.sock
+service vesta restart
\ No newline at end of file