Skip to content

Commit

Permalink
fix startup and upgrade nginx
Browse files Browse the repository at this point in the history
  • Loading branch information
noogen committed Dec 1, 2021
1 parent bca6f76 commit 10e548f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
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
Expand Down
2 changes: 0 additions & 2 deletions files/root/bin/my-startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 10e548f

Please sign in to comment.