Merge branch 'release/1.3.0'

Author: pascalberger

Dockerfile

@@ -1,5 +1,5 @@
-FROM nginxinc/nginx-unprivileged:1.17.8-alpine
-LABEL MAINTAINER="BBT Software AG <devadmin@bbtsoftware.ch>"
+FROM nginx:1.17.10-alpine
+LABEL MAINTAINER="BBT Software AG <opensource@bbtsoftware.ch>"
 
 ENV CHK_DOCKER_API_VERSION v1.38
 ENV CHK_INTERVAL 60
@@ -10,12 +10,8 @@ ENV TZ UTC
 
 COPY index.html /usr/share/nginx/html/index.html
 
-USER root
-RUN chmod 775 /usr/share/nginx/html/
-RUN chown nginx:nginx /usr/share/nginx/html/
 RUN apk add --no-cache bash curl jq && \
     echo $TZ > /etc/timezone
-USER nginx
 
 COPY docker-entrypoint.sh /usr/local/bin/
 

README.md

@@ -31,6 +31,7 @@ docker pull bbtsoftwareag/swarm-monitor
 | Tag    | Description                                                                             | Size                                                                                                                   |
 |--------|-----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------|
 | latest | Latest master build                                                                     | ![Size](https://shields.beevelop.com/docker/image/image-size/bbtsoftwareag/swarm-monitor/latest.svg?style=flat-square) |
+| 1.3.0  | Release [1.3.0](https://github.com/bbtsoftware/docker-swarm-monitor/releases/tag/1.3.0) | ![Size](https://shields.beevelop.com/docker/image/image-size/bbtsoftwareag/swarm-monitor/1.3.0.svg?style=flat-square)  |
 | 1.2.0  | Release [1.2.0](https://github.com/bbtsoftware/docker-swarm-monitor/releases/tag/1.2.0) | ![Size](https://shields.beevelop.com/docker/image/image-size/bbtsoftwareag/swarm-monitor/1.2.0.svg?style=flat-square)  |
 | 1.1.0  | Release [1.1.0](https://github.com/bbtsoftware/docker-swarm-monitor/releases/tag/1.1.0) | ![Size](https://shields.beevelop.com/docker/image/image-size/bbtsoftwareag/swarm-monitor/1.1.0.svg?style=flat-square)  |
 | 1.0.0  | Release [1.0.0](https://github.com/bbtsoftware/docker-swarm-monitor/releases/tag/1.0.0) | ![Size](https://shields.beevelop.com/docker/image/image-size/bbtsoftwareag/swarm-monitor/1.0.0.svg?style=flat-square)  |
@@ -45,7 +46,7 @@ docker pull bbtsoftwareag/swarm-monitor
 
 | Port | Protocol | Description                          |
 |------|----------|--------------------------------------|
-|   80 | TCP      | Web-UI which provides `status.json`. |
+| 80   | TCP      | Web-UI which provides `status.json`. |
 
 ### Configuration