| Message ID | 20180808010806.17780-1-sam@mendozajonas.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | docker: Use host networking | expand |
Hi Sam, On 08/07/2018 06:08 PM, Samuel Mendoza-Jonas wrote: > Use the host driver by default to simplify networking for build-builder, > especially when DNS settings need to be inherited from the host. Looks OK, but you should update the docker image version. That will change the docker tag, and cause the jenkins job (which runs build-builder) to automatically build and use the new image. diff --git a/docker/builder-include b/docker/builder-include index d2d94a4..4f42e2c 100644 --- a/docker/builder-include +++ b/docker/builder-include @@ -50,7 +50,7 @@ show_tag () { echo "${DOCKER_TAG}" } -: ${VERSION:="2"} +: ${VERSION:="3"} : ${ARCH_TAG:="$(arch_tag)"} : ${DOCKER_NAME:="pb-builder"} : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"} -Geoff
On Wed, 2018-08-08 at 13:12 -0700, Geoff Levand wrote: > Hi Sam, > > On 08/07/2018 06:08 PM, Samuel Mendoza-Jonas wrote: > > Use the host driver by default to simplify networking for build-builder, > > especially when DNS settings need to be inherited from the host. > > Looks OK, but you should update the docker image version. That > will change the docker tag, and cause the jenkins job (which runs > build-builder) to automatically build and use the new image. Good point, if I merge this together with your strace patch would you prefer me to increment it to VERSION:="4" or leave it as is? > > diff --git a/docker/builder-include b/docker/builder-include > index d2d94a4..4f42e2c 100644 > --- a/docker/builder-include > +++ b/docker/builder-include > @@ -50,7 +50,7 @@ show_tag () { > echo "${DOCKER_TAG}" > } > > -: ${VERSION:="2"} > +: ${VERSION:="3"} > : ${ARCH_TAG:="$(arch_tag)"} > : ${DOCKER_NAME:="pb-builder"} > : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"} > > -Geoff >
Hi Sam, On 08/08/2018 06:30 PM, Samuel Mendoza-Jonas wrote: > On Wed, 2018-08-08 at 13:12 -0700, Geoff Levand wrote: >> >> Looks OK, but you should update the docker image version. That >> will change the docker tag, and cause the jenkins job (which runs >> build-builder) to automatically build and use the new image. > > Good point, if I merge this together with your strace patch would you > prefer me to increment it to VERSION:="4" or leave it as is? I think just increment by one for the whole thing. I can remove the pb-builder:3 images I have here from testing. -Geoff
On Wed, 2018-08-08 at 11:08 +1000, Samuel Mendoza-Jonas wrote: > Use the host driver by default to simplify networking for build-builder, > especially when DNS settings need to be inherited from the host. > > Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> Merged as 06179e62 > --- > docker/build-builder | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/docker/build-builder b/docker/build-builder > index c29e032a..8dcfba82 100755 > --- a/docker/build-builder > +++ b/docker/build-builder > @@ -123,6 +123,7 @@ run_cmd "docker build \ > --build-arg http_proxy=${http_proxy} \ > --build-arg https_proxy=${https_proxy} \ > --tag ${DOCKER_TAG} \ > + --network=host \ > ." > > show_tag
diff --git a/docker/build-builder b/docker/build-builder index c29e032a..8dcfba82 100755 --- a/docker/build-builder +++ b/docker/build-builder @@ -123,6 +123,7 @@ run_cmd "docker build \ --build-arg http_proxy=${http_proxy} \ --build-arg https_proxy=${https_proxy} \ --tag ${DOCKER_TAG} \ + --network=host \ ." show_tag
Use the host driver by default to simplify networking for build-builder, especially when DNS settings need to be inherited from the host. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> --- docker/build-builder | 1 + 1 file changed, 1 insertion(+)