diff mbox series

[5/9] gitlab-ci: explicitly reference the upstream registry

Message ID 20210525082556.4011380-6-f4bug@amsat.org
State New
Headers show
Series None | expand

Commit Message

Philippe Mathieu-Daudé May 25, 2021, 8:25 a.m. UTC 
From: Alex Bennée <alex.bennee@linaro.org>


Since c8e6793903 ("containers.yml: build with docker.py tooling") we
don't need to manually pull stuff from the upstream repository. Just
set the -r field to explicitly use that rather than the current
registry.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

[PMD: Rebased]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

---
 .gitlab-ci.d/container-template.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.26.3

Comments

Alex Bennée May 25, 2021, 11:10 a.m. UTC | #1 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> From: Alex Bennée <alex.bennee@linaro.org>

>

> Since c8e6793903 ("containers.yml: build with docker.py tooling") we

> don't need to manually pull stuff from the upstream repository. Just

> set the -r field to explicitly use that rather than the current

> registry.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org>

> Reviewed-by: Willian Rampazzo <willianr@redhat.com>

> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> [PMD: Rebased]

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


FWIW this should get merged with today's PR.

-- 
Alex Bennée
Philippe Mathieu-Daudé May 25, 2021, 11:39 a.m. UTC | #2 
On 5/25/21 1:10 PM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

>> From: Alex Bennée <alex.bennee@linaro.org>

>>

>> Since c8e6793903 ("containers.yml: build with docker.py tooling") we

>> don't need to manually pull stuff from the upstream repository. Just

>> set the -r field to explicitly use that rather than the current

>> registry.

>>

>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

>> Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org>

>> Reviewed-by: Willian Rampazzo <willianr@redhat.com>

>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>> [PMD: Rebased]

>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 

> FWIW this should get merged with today's PR.


Cool :) This was in case Thomas sends his pull request before yours.
diff mbox series

Patch

diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml
index 9e3f3ae3c26..1baecd94606 100644
--- a/.gitlab-ci.d/container-template.yml
+++ b/.gitlab-ci.d/container-template.yml
@@ -12,10 +12,9 @@ 
   script:
     - echo "TAG:$TAG"
     - echo "COMMON_TAG:$COMMON_TAG"
-    - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
     - ./tests/docker/docker.py --engine docker build
           -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
-          -r $CI_REGISTRY_IMAGE
+          -r $CI_REGISTRY/qemu-project/qemu
     - docker tag "qemu/$NAME" "$TAG"
     - docker push "$TAG"
   after_script: