diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2019-01-23 19:22:42 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2019-01-23 19:22:42 -0500 |
| commit | 68808e6640876cf5f342abbac362ab13eb5640fe (patch) | |
| tree | 56abd7be84fe8d564c8ad99bef952210b7a49ce2 | |
| parent | d91c6efd2b7b973fa7aed064b43b64139d7612e7 (diff) | |
| download | libnice-68808e6640876cf5f342abbac362ab13eb5640fe.tar.gz | |
gitlab-ci: Move docker images to main libnice repo
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | tests/docker/centos7-autotools/Dockerfile | 8 | ||||
| -rw-r--r-- | tests/docker/centos7-meson/Dockerfile | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 759d583..4336789 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: build autotools: stage: build - image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build + image: registry.freedesktop.org/libnice/libnice/centos7/autotools-build except: - schedules script: @@ -21,7 +21,7 @@ build autotools: test autotools: stage: test - image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build + image: registry.freedesktop.org/libnice/libnice/centos7/autotools-build except: - schedules dependencies: @@ -41,7 +41,7 @@ test autotools: distcheck autotools: stage: test - image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build + image: registry.freedesktop.org/libnice/libnice/centos7/autotools-build except: - schedules dependencies: @@ -55,7 +55,7 @@ distcheck autotools: build meson: stage: build - image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build + image: registry.freedesktop.org/libnice/libnice/centos7/meson-build variables: PREFIX: "${CI_PROJECT_DIR}/libnice-prefix" except: @@ -73,7 +73,7 @@ build meson: test meson: stage: test - image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build + image: registry.freedesktop.org/libnice/libnice/centos7/meson-build allow_failure: true dependencies: - build meson @@ -90,7 +90,7 @@ test meson: doc-and-install meson: stage: test - image: registry.freedesktop.org/ocrete/libnice/centos7/meson-build + image: registry.freedesktop.org/libnice/libnice/centos7/meson-build dependencies: - build meson except: @@ -108,7 +108,7 @@ doc-and-install meson: submit-to-coverity: stage: test - image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build + image: registry.freedesktop.org/libnice/libnice/centos7/autotools-build variables: COVERITY_PROJECT: libnice only: diff --git a/tests/docker/centos7-autotools/Dockerfile b/tests/docker/centos7-autotools/Dockerfile index 7141076..a97db9d 100644 --- a/tests/docker/centos7-autotools/Dockerfile +++ b/tests/docker/centos7-autotools/Dockerfile @@ -1,8 +1,8 @@ # build with -# docker build -t registry.freedesktop.org/ocrete/libnice/centos7/autotools-build:$(date --rfc-3339=date) . -# docker tag registry.freedesktop.org/ocrete/libnice/centos7/autotools-build:$(date --rfc-3339=date) registry.freedesktop.org/ocrete/libnice/centos7/autotools-build:latest -# docker push registry.freedesktop.org/ocrete/libnice/centos7/autotools-build:$(date --rfc-3339=date) -# docker push registry.freedesktop.org/ocrete/libnice/centos7/autotools-build:latest +# docker build -t registry.freedesktop.org/libnice/libnice/centos7/autotools-build:$(date --rfc-3339=date) . +# docker tag registry.freedesktop.org/libnice/libnice/centos7/autotools-build:$(date --rfc-3339=date) registry.freedesktop.org/libnice/libnice/centos7/autotools-build:latest +# docker push registry.freedesktop.org/libnice/libnice/centos7/autotools-build:$(date --rfc-3339=date) +# docker push registry.freedesktop.org/libnice/libnice/centos7/autotools-build:latest FROM centos:centos7 diff --git a/tests/docker/centos7-meson/Dockerfile b/tests/docker/centos7-meson/Dockerfile index f2efb6b..f7fa1e1 100644 --- a/tests/docker/centos7-meson/Dockerfile +++ b/tests/docker/centos7-meson/Dockerfile @@ -1,8 +1,8 @@ # build with -# docker build -t registry.freedesktop.org/ocrete/libnice/centos7/meson-build:$(date --rfc-3339=date) . -# docker tag registry.freedesktop.org/ocrete/libnice/centos7/meson-build:$(date --rfc-3339=date) registry.freedesktop.org/ocrete/libnice/centos7/meson-build:latest -# docker push registry.freedesktop.org/ocrete/libnice/centos7/meson-build:latest -# docker push registry.freedesktop.org/ocrete/libnice/centos7/meson-build:$(date --rfc-3339=date) +# docker build -t registry.freedesktop.org/libnice/libnice/centos7/meson-build:$(date --rfc-3339=date) . +# docker tag registry.freedesktop.org/libnice/libnice/centos7/meson-build:$(date --rfc-3339=date) registry.freedesktop.org/libnice/libnice/centos7/meson-build:latest +# docker push registry.freedesktop.org/libnice/libnice/centos7/meson-build:latest +# docker push registry.freedesktop.org/libnice/libnice/centos7/meson-build:$(date --rfc-3339=date) FROM centos:centos7 |