diff options
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | ci/containers/README.rst (renamed from ci/README.rst) | 0 | ||||
-rw-r--r-- | ci/containers/ci-centos-7.Dockerfile (renamed from ci/ci-centos-7.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-centos-8.Dockerfile (renamed from ci/ci-centos-8.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-debian-10.Dockerfile (renamed from ci/ci-debian-10.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-debian-9.Dockerfile (renamed from ci/ci-debian-9.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-debian-sid.Dockerfile (renamed from ci/ci-debian-sid.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-fedora-31.Dockerfile (renamed from ci/ci-fedora-31.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-fedora-32.Dockerfile (renamed from ci/ci-fedora-32.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile (renamed from ci/ci-fedora-rawhide-cross-mingw32.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile (renamed from ci/ci-fedora-rawhide-cross-mingw64.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-fedora-rawhide.Dockerfile (renamed from ci/ci-fedora-rawhide.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-opensuse-151.Dockerfile (renamed from ci/ci-opensuse-151.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-ubuntu-1804.Dockerfile (renamed from ci/ci-ubuntu-1804.Dockerfile) | 0 | ||||
-rw-r--r-- | ci/containers/ci-ubuntu-2004.Dockerfile (renamed from ci/ci-ubuntu-2004.Dockerfile) | 0 | ||||
-rwxr-xr-x | ci/containers/refresh (renamed from ci/refresh) | 0 |
16 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f514d..bd94cb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ stages: - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/ci-$NAME.Dockerfile" ci + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci - docker push "$TAG" after_script: - docker logout diff --git a/ci/README.rst b/ci/containers/README.rst index 530897e..530897e 100644 --- a/ci/README.rst +++ b/ci/containers/README.rst diff --git a/ci/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index 9849b1c..9849b1c 100644 --- a/ci/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile diff --git a/ci/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index 0cc9715..0cc9715 100644 --- a/ci/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile diff --git a/ci/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index 333d518..333d518 100644 --- a/ci/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile diff --git a/ci/ci-debian-9.Dockerfile b/ci/containers/ci-debian-9.Dockerfile index f2d0c83..f2d0c83 100644 --- a/ci/ci-debian-9.Dockerfile +++ b/ci/containers/ci-debian-9.Dockerfile diff --git a/ci/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index 6257d66..6257d66 100644 --- a/ci/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile diff --git a/ci/ci-fedora-31.Dockerfile b/ci/containers/ci-fedora-31.Dockerfile index 7788651..7788651 100644 --- a/ci/ci-fedora-31.Dockerfile +++ b/ci/containers/ci-fedora-31.Dockerfile diff --git a/ci/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index 41d1721..41d1721 100644 --- a/ci/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile diff --git a/ci/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index ee3cb2f..ee3cb2f 100644 --- a/ci/ci-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index 19ea93f..19ea93f 100644 --- a/ci/ci-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index c487d5d..c487d5d 100644 --- a/ci/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile diff --git a/ci/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile index 05ab919..05ab919 100644 --- a/ci/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-151.Dockerfile diff --git a/ci/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index 6cd6f74..6cd6f74 100644 --- a/ci/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile diff --git a/ci/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index c77ae51..c77ae51 100644 --- a/ci/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile diff --git a/ci/refresh b/ci/containers/refresh index 709dc08..709dc08 100755 --- a/ci/refresh +++ b/ci/containers/refresh |