Skip to content

Commit

Permalink
Merge branch 'release/7.1.0-1.6.1-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
MickaelCa committed Aug 5, 2022
2 parents 9f173a3 + 29f5226 commit 9b5a4f8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Build & Push branches
on:
push:
branches:
- 'main'
- 'develop'
tags:
- '*'
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [7.1.0-1.6.1] - 2014-05-31
## [7.1.0-1.6.1-1] - 2022-08-05
### Fixed
- prom exporter varnish working directory

## [7.1.0-1.6.1] - 2022-07-26
### Added
- init repository

[7.1.0-1.6.1-1]: https://github.com/Softizy/varnish-with-prom-exporter-docker/releases/tag/7.1.0-1.6.1-1
[7.1.0-1.6.1]: https://github.com/Softizy/varnish-with-prom-exporter-docker/releases/tag/7.1.0-1.6.1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ docker pull ghcr.io/softizy/varnish-with-prom-exporter-docker:latest
docker run -p 8080:8080 -p 8443:8443 -p 9131:9131 -v /path/to/your.vcl:/etc/varnish/default.vcl ghcr.io/softizy/varnish-with-prom-exporter-docker:latest
```

Tag template : `{varnish-version}-{varnish-exporter-version}`
Tag template : `{varnish-version}-{varnish-exporter-version}-{patch}`

## Contributing
Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
Expand Down
2 changes: 1 addition & 1 deletion startup-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi

exec "$@" &

/usr/sbin/prometheus_varnish_exporter -web.listen-address "0.0.0.0:9131" -web.telemetry-path "/metrics" -web.health-path "/health" &
/usr/sbin/prometheus_varnish_exporter -web.listen-address "0.0.0.0:9131" -web.telemetry-path "/metrics" -web.health-path "/health" -n /tmp/varnish &

wait -n

Expand Down

0 comments on commit 9b5a4f8

Please sign in to comment.