mirror of
https://github.com/outbackdingo/matchbox.git
synced 2026-01-27 18:19:36 +00:00
Merge pull request #626 from coreos/bump-dnsmasq
*: Bump dnsmasq references to use v0.4.1
This commit is contained in:
@@ -114,7 +114,7 @@ sudo rkt run --net=metal0:IP=172.18.0.3 \
|
||||
--dns=host \
|
||||
--mount volume=config,target=/etc/dnsmasq.conf \
|
||||
--volume config,kind=host,source=$PWD/contrib/dnsmasq/metal0.conf \
|
||||
quay.io/coreos/dnsmasq:v0.4.0 \
|
||||
quay.io/coreos/dnsmasq:v0.4.1 \
|
||||
--caps-retain=CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SETGID,CAP_SETUID,CAP_NET_RAW
|
||||
```
|
||||
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
|
||||
Notable changes image releases. The dnsmasq project [upstream](http://www.thekelleys.org.uk/dnsmasq/doc.html) has its own [changelog](http://www.thekelleys.org.uk/dnsmasq/CHANGELOG).
|
||||
|
||||
## v0.4.1
|
||||
|
||||
* Rebuild with alpine:3.6 base image
|
||||
* Add EXPOSE ports 67 and 69 to Dockerfile
|
||||
|
||||
## v0.4.0
|
||||
|
||||
* `dnsmasq` package version 2.76
|
||||
|
||||
@@ -129,7 +129,7 @@ function rkt_create {
|
||||
--dns=host \
|
||||
--mount volume=config,target=/etc/dnsmasq.conf \
|
||||
--volume config,kind=host,source=$DIR/../contrib/dnsmasq/metal0.conf \
|
||||
quay.io/coreos/dnsmasq:v0.4.0 \
|
||||
quay.io/coreos/dnsmasq:v0.4.1 \
|
||||
--caps-retain="CAP_NET_ADMIN,CAP_NET_BIND_SERVICE"
|
||||
|
||||
status
|
||||
@@ -181,7 +181,7 @@ function docker_create {
|
||||
-d \
|
||||
--cap-add=NET_ADMIN \
|
||||
-v $PWD/contrib/dnsmasq/docker0.conf:/etc/dnsmasq.conf:Z \
|
||||
quay.io/coreos/dnsmasq:v0.4.0 -d
|
||||
quay.io/coreos/dnsmasq:v0.4.1 -d
|
||||
}
|
||||
|
||||
function docker_status {
|
||||
|
||||
Reference in New Issue
Block a user