diff mbox series

[v1,2/8] gitlab: explicitly reference the upstream registry

Message ID 20210520174303.12310-3-alex.bennee@linaro.org
State Superseded
Headers show
Series various misc fixes (gitlab, gdbstub, plugins) | expand

Commit Message

Alex Bennée May 20, 2021, 5:42 p.m. UTC 
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>

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

-- 
2.20.1

Comments

Willian Rampazzo May 24, 2021, 7:15 p.m. UTC | #1 
On Thu, May 20, 2021 at 2:43 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>

> 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>

> ---

>  .gitlab-ci.d/containers.yml | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

>


Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Philippe Mathieu-Daudé May 25, 2021, 4:04 a.m. UTC | #2 
On 5/20/21 7:42 PM, Alex Bennée wrote:
> 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.


Yay!

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

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


> 

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

> ---

>  .gitlab-ci.d/containers.yml | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 765408ae27..3fb3c14f06 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.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: