From 8343de38877a06653a1b10e4f794e0e283a77c68 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Thu, 30 Jan 2020 22:05:08 +0100 Subject: [PATCH 1/5] Update to port 8080 --- Dockerfile | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6bd7579..ffee56c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] -EXPOSE 80 +EXPOSE 8080 HEALTHCHECK --interval=1m --timeout=3s \ - CMD curl -f http://localhost/status.json || exit 1 \ No newline at end of file + CMD curl -f http://localhost:8080/status.json || exit 1 \ No newline at end of file diff --git a/README.md b/README.md index de12afa..29e030e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ docker pull bbtsoftwareag/swarm-monitor | Port | Protocol | Description | |------|----------|--------------------------------------| -| 80 | TCP | Web-UI which provides `status.json`. | +| 8080 | TCP | Web-UI which provides `status.json`. | ### Configuration @@ -72,7 +72,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock ports: - - 80:80 + - 80:8080 environment: - TZ=Europe/Zurich - CHK_DOCKER_API_VERSION=v1.38 @@ -90,7 +90,7 @@ services: ```sh docker run -d \ -v /var/run/docker.sock:/var/run/docker.sock \ - -p 80:80 \ + -p 80:8080 \ -e TZ=Europe/Zurich \ -e CHK_DOCKER_API_VERSION=v1.38 \ -e CHK_INTERVAL=60 \ From 5117152704b97bfbde5bd3585bb2c23b995768f9 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Fri, 22 May 2020 14:36:08 +0200 Subject: [PATCH 2/5] Update maintainer email address --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffee56c..3c96b3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM nginxinc/nginx-unprivileged:1.17.8-alpine -LABEL MAINTAINER="BBT Software AG " +LABEL MAINTAINER="BBT Software AG " ENV CHK_DOCKER_API_VERSION v1.38 ENV CHK_INTERVAL 60 From 21e5f4fc6de554caa9eda0b62aa889353e5893dd Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Fri, 22 May 2020 14:51:56 +0200 Subject: [PATCH 3/5] Revert back to privileged image --- Dockerfile | 10 +++------- README.md | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c96b3a..c4d98af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginxinc/nginx-unprivileged:1.17.8-alpine +FROM nginx:1.17.8-alpine LABEL MAINTAINER="BBT Software AG " ENV CHK_DOCKER_API_VERSION v1.38 @@ -10,18 +10,14 @@ 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/ ENTRYPOINT ["docker-entrypoint.sh"] -EXPOSE 8080 +EXPOSE 80 HEALTHCHECK --interval=1m --timeout=3s \ - CMD curl -f http://localhost:8080/status.json || exit 1 \ No newline at end of file + CMD curl -f http://localhost/status.json || exit 1 \ No newline at end of file diff --git a/README.md b/README.md index 29e030e..f03bc0d 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ docker pull bbtsoftwareag/swarm-monitor | Port | Protocol | Description | |------|----------|--------------------------------------| -| 8080 | TCP | Web-UI which provides `status.json`. | +| 80 | TCP | Web-UI which provides `status.json`. | ### Configuration @@ -72,7 +72,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock ports: - - 80:8080 + - 80:80 environment: - TZ=Europe/Zurich - CHK_DOCKER_API_VERSION=v1.38 @@ -90,7 +90,7 @@ services: ```sh docker run -d \ -v /var/run/docker.sock:/var/run/docker.sock \ - -p 80:8080 \ + -p 80:80 \ -e TZ=Europe/Zurich \ -e CHK_DOCKER_API_VERSION=v1.38 \ -e CHK_INTERVAL=60 \ From c0a899ca2fc6a9e2a9a2f41ef1e7b504fe57c054 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 13:45:42 +0000 Subject: [PATCH 4/5] Bump nginx from 1.17.8-alpine to 1.17.10-alpine Bumps nginx from 1.17.8-alpine to 1.17.10-alpine. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c4d98af..eb9d94b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.17.8-alpine +FROM nginx:1.17.10-alpine LABEL MAINTAINER="BBT Software AG " ENV CHK_DOCKER_API_VERSION v1.38 From 3b6b5a27561235559ed85ad98fda442ded03f819 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Fri, 22 May 2020 15:55:41 +0200 Subject: [PATCH 5/5] Add 1.3.0 to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f03bc0d..0467eb6 100644 --- a/README.md +++ b/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) |