public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Oleg Vasilev <oleg.vasilev@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH v4 3/6] gitlab-ci: rename Dockerfiles
Date: Tue, 27 Aug 2019 17:01:59 +0300	[thread overview]
Message-ID: <20190827140202.3347-3-oleg.vasilev@intel.com> (raw)
In-Reply-To: <20190827140202.3347-1-oleg.vasilev@intel.com>

Dockerfile.build-* is consistent with build-* naming.

Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
---
 .gitlab-ci.yml                                | 24 +++++++++----------
 Dockerfile.debian => Dockerfile.build-debian  |  0
 ...ian-arm64 => Dockerfile.build-debian-arm64 |  0
 ...ian-armhf => Dockerfile.build-debian-armhf |  0
 ...minimal => Dockerfile.build-debian-minimal |  0
 ...ebian-mips => Dockerfile.build-debian-mips |  0
 Dockerfile.fedora => Dockerfile.build-fedora  |  0
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename Dockerfile.debian => Dockerfile.build-debian (100%)
 rename Dockerfile.debian-arm64 => Dockerfile.build-debian-arm64 (100%)
 rename Dockerfile.debian-armhf => Dockerfile.build-debian-armhf (100%)
 rename Dockerfile.debian-minimal => Dockerfile.build-debian-minimal (100%)
 rename Dockerfile.debian-mips => Dockerfile.build-debian-mips (100%)
 rename Dockerfile.fedora => Dockerfile.build-fedora (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c4c8227..3433ca08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,8 @@ build-containers:build-debian:
   image: docker:stable
   only:
     changes:
-      - Dockerfile.debian-minimal
-      - Dockerfile.debian
+      - Dockefile.build-debian-minimal
+      - Dockefile.build-debian
       - .gitlab-ci.yml
   services:
     - docker:dind
@@ -34,8 +34,8 @@ build-containers:build-debian:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockerfile.debian-minimal .
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockerfile.debian .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockefile.build-debian-minimal .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockefile.build-debian .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian
 
@@ -44,7 +44,7 @@ build-containers:build-debian-armhf:
   image: docker:stable
   only:
     changes:
-      - Dockerfile.debian-armhf
+      - Dockefile.build-debian-armhf
       - .gitlab-ci.yml
   services:
     - docker:dind
@@ -53,7 +53,7 @@ build-containers:build-debian-armhf:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockerfile.debian-armhf .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockefile.build-debian-armhf .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf
 
 build-containers:build-debian-arm64:
@@ -61,7 +61,7 @@ build-containers:build-debian-arm64:
   image: docker:stable
   only:
     changes:
-      - Dockerfile.debian-arm64
+      - Dockefile.build-debian-arm64
       - .gitlab-ci.yml
   services:
     - docker:dind
@@ -70,7 +70,7 @@ build-containers:build-debian-arm64:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockerfile.debian-arm64 .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockefile.build-debian-arm64 .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64
 
 build-containers:build-debian-mips:
@@ -78,7 +78,7 @@ build-containers:build-debian-mips:
   image: docker:stable
   only:
     changes:
-      - Dockerfile.debian-mips
+      - Dockefile.build-debian-mips
       - .gitlab-ci.yml
   services:
     - docker:dind
@@ -87,7 +87,7 @@ build-containers:build-debian-mips:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockerfile.debian-mips .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockefile.build-debian-mips .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips
 
 build-containers:build-fedora:
@@ -95,7 +95,7 @@ build-containers:build-fedora:
   image: docker:stable
   only:
     changes:
-      - Dockerfile.fedora
+      - Dockefile.build-fedora
       - .gitlab-ci.yml
   services:
     - docker:dind
@@ -104,7 +104,7 @@ build-containers:build-fedora:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockerfile.fedora .
+    - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockefile.build-fedora .
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora
 
 #################### BUILD #########################
diff --git a/Dockerfile.debian b/Dockerfile.build-debian
similarity index 100%
rename from Dockerfile.debian
rename to Dockerfile.build-debian
diff --git a/Dockerfile.debian-arm64 b/Dockerfile.build-debian-arm64
similarity index 100%
rename from Dockerfile.debian-arm64
rename to Dockerfile.build-debian-arm64
diff --git a/Dockerfile.debian-armhf b/Dockerfile.build-debian-armhf
similarity index 100%
rename from Dockerfile.debian-armhf
rename to Dockerfile.build-debian-armhf
diff --git a/Dockerfile.debian-minimal b/Dockerfile.build-debian-minimal
similarity index 100%
rename from Dockerfile.debian-minimal
rename to Dockerfile.build-debian-minimal
diff --git a/Dockerfile.debian-mips b/Dockerfile.build-debian-mips
similarity index 100%
rename from Dockerfile.debian-mips
rename to Dockerfile.build-debian-mips
diff --git a/Dockerfile.fedora b/Dockerfile.build-fedora
similarity index 100%
rename from Dockerfile.fedora
rename to Dockerfile.build-fedora
-- 
2.23.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-08-27 14:02 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-27 14:01 [igt-dev] [PATCH v4 1/6] gitlab-ci: move containers section to the top Oleg Vasilev
2019-08-27 14:01 ` [igt-dev] [PATCH v4 2/6] gitlab-ci: rename igt-* container to build-* Oleg Vasilev
2019-08-27 14:01 ` Oleg Vasilev [this message]
2019-08-27 14:02 ` [igt-dev] [PATCH v4 4/6] gitlab-ci: rebuild images only on Dockerfile changes Oleg Vasilev
2019-08-27 14:02 ` [igt-dev] [PATCH v4 5/6] gitlab-ci: use images tagged with git ref instead of latest Oleg Vasilev
2019-08-27 14:02 ` [igt-dev] [PATCH v4 6/6] gitlab-ci: introduce containers with IGT inside Oleg Vasilev
2019-08-28  6:03   ` Arkadiusz Hiler
2019-08-28 10:13     ` Vasilev, Oleg
2019-08-27 14:29 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v4,1/6] gitlab-ci: move containers section to the top Patchwork
2019-08-28 12:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190827140202.3347-3-oleg.vasilev@intel.com \
    --to=oleg.vasilev@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox