Skip to content

Commit

Permalink
Revert back to privileged image
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed May 22, 2020
1 parent 6a685d1 commit 5bec2d5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginxinc/nginx-unprivileged:1.17.8-alpine
FROM nnginx:1.17.8-alpine
LABEL MAINTAINER="BBT Software AG <opensource@bbtsoftware.ch>"

ENV CHK_DOCKER_API_VERSION v1.38
Expand All @@ -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
CMD curl -f http://localhost/status.json || exit 1
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 5bec2d5

Please sign in to comment.