Skip to content

Commit 10e548f

Browse files
committed
fix startup and upgrade nginx
1 parent bca6f76 commit 10e548f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
FROM ubuntu:20.04 AS buildstep
22
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
33
NGINX_DEVEL_KIT_VERSION=0.3.1 NGINX_SET_MISC_MODULE_VERSION=0.32 \
4-
NGINX_VERSION=1.20.1
4+
NGINX_VERSION=1.20.2
55
ADD ./build/ /tmp/
66
RUN bash /tmp/ubuntu.sh
77

88

99
FROM ubuntu:20.04
1010
LABEL maintainer="noogen <[email protected]>"
1111
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
12-
NGINX_VERSION=_1.20.1-1~focal_amd64.deb \
12+
NGINX_VERSION=_1.20.2-1~focal_amd64.deb \
1313
NGINX_DEBUG=-dbg${NGINX_VERSION}
1414

1515
COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp

files/root/bin/my-startup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ if [ -n "$SERVER_CONF" ] ; then
2121

2222
mv /app/etc/nginx/sites-enabled/server.conf /app/etc/nginx/sites-enabled/server.bak
2323
curl -SL $SERVER_CONF --output /app/etc/nginx/sites-enabled/server.conf
24-
25-
service nginx reload
2624
fi
2725

2826
echo "*** Running cron"

0 commit comments

Comments
 (0)