fix startup and upgrade nginx

niiknow · Dec 1, 2021 · 10e548f · 10e548f
1 parent bca6f76
commit 10e548f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:20.04 AS buildstep
 ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
     NGINX_DEVEL_KIT_VERSION=0.3.1 NGINX_SET_MISC_MODULE_VERSION=0.32 \
-    NGINX_VERSION=1.20.1
+    NGINX_VERSION=1.20.2
 ADD ./build/ /tmp/
 RUN bash /tmp/ubuntu.sh
 
 
 FROM ubuntu:20.04
 LABEL maintainer="noogen <friends@niiknow.org>"
 ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
-    NGINX_VERSION=_1.20.1-1~focal_amd64.deb \
+    NGINX_VERSION=_1.20.2-1~focal_amd64.deb \
     NGINX_DEBUG=-dbg${NGINX_VERSION}
 
 COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp

diff --git a/files/root/bin/my-startup.sh b/files/root/bin/my-startup.sh
@@ -21,8 +21,6 @@ if [ -n "$SERVER_CONF" ] ; then
 
    mv /app/etc/nginx/sites-enabled/server.conf /app/etc/nginx/sites-enabled/server.bak
    curl -SL $SERVER_CONF --output /app/etc/nginx/sites-enabled/server.conf
-
-   service nginx reload
 fi
 
 echo "*** Running cron"