| Message ID | 20170807153934.29477-2-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Various docker fixes | expand |
On Mon, 08/07 16:39, Alex Bennée wrote: > While adding the current user is a useful default behaviour for > creating new images it is not appropriate for Travis which already has > a default user. Target docker-travis@travis will not have NOUSER=1 automatically, right? Is that a problem? Fam > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/docker/Makefile.include | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index aaab1a4208..d7dafdbd27 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -71,6 +71,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 > docker-image-debian-s390x-cross: docker-image-debian9 > docker-image-debian-win32-cross: docker-image-debian8-mxe > docker-image-debian-win64-cross: docker-image-debian8-mxe > +docker-image-travis: NOUSER=1 > > # Expand all the pre-requistes for each docker image and test combination > $(foreach i,$(DOCKER_IMAGES), \ > -- > 2.13.0 > >
Fam Zheng <famz@redhat.com> writes: > On Mon, 08/07 16:39, Alex Bennée wrote: >> While adding the current user is a useful default behaviour for >> creating new images it is not appropriate for Travis which already has >> a default user. > > Target docker-travis@travis will not have NOUSER=1 automatically, right? Is that > a problem? It doesn't until this patch. In fact it would be better if we ran travis tests with the travis user rather than the mapped local user. > > Fam > >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> tests/docker/Makefile.include | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include >> index aaab1a4208..d7dafdbd27 100644 >> --- a/tests/docker/Makefile.include >> +++ b/tests/docker/Makefile.include >> @@ -71,6 +71,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 >> docker-image-debian-s390x-cross: docker-image-debian9 >> docker-image-debian-win32-cross: docker-image-debian8-mxe >> docker-image-debian-win64-cross: docker-image-debian8-mxe >> +docker-image-travis: NOUSER=1 >> >> # Expand all the pre-requistes for each docker image and test combination >> $(foreach i,$(DOCKER_IMAGES), \ >> -- >> 2.13.0 >> >> -- Alex Bennée
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index aaab1a4208..d7dafdbd27 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -71,6 +71,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe +docker-image-travis: NOUSER=1 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \