Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Jan 30, 2020
2 parents 56ea1e9 + f1b814f commit 12ba8e9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.17.3-alpine
FROM nginxinc/nginx-unprivileged:1.17.8-alpine
LABEL MAINTAINER="BBT Software AG <[email protected]>"

ENV CHK_DOCKER_API_VERSION v1.38
Expand All @@ -10,10 +10,15 @@ 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 80
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Docker image to monitor a [Docker Swarm](https://docs.docker.com/engine/swarm/).

Supported monitoring systems:

* [PRTG Network Monitor](https://www.paessler.com/prtg/)

## Information

| Service | Stats |
Expand All @@ -27,8 +31,9 @@ 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.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) |
| 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) |

### Volumes

Expand Down Expand Up @@ -92,4 +97,4 @@ docker run -d \
-e CHK_MONITOR=prtg \
-e "CHK_SERVICES=monitor_app.1 proxy_app.3" \
bbtsoftwareag/swarm-monitor:latest
```
```

0 comments on commit 12ba8e9

Please sign in to comment.