[librsvg-oci-images/altiera/f-docker] Docker: dockerfiles are not yml

[Jordan Petridis <jpetridis src gnome org>]

commit f848d31ce6109eecfa3670570d51c37b502870a6
Author: Jordan Petridis <jpetridis gnome org>
Date:   Sat Feb 16 18:13:29 2019 +0200

    Docker: dockerfiles are not yml
    
    Probably confused dockerfiles with compose files at some point

 .gitlab-ci.yml                            | 24 ++++++++++++------------
 debian/{bionic.yml => bionic}             |  0
 debian/{i386_bionic.yml => i386_bionic}   |  0
 debian/{i386_testing.yml => i386_testing} |  0
 debian/{testing.yml => testing}           |  0
 fedora/{latest.yml => latest}             |  0
 fedora/{rawhide.yml => rawhide}           |  0
 opensuse/{tumbleweed.yml => tumbleweed}   |  0
 8 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebc1151..f6d50aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,18 +12,18 @@ stages:
     - rustc
 
 # Expects $IMAGE which should be the name+tag of the registry image.
-# Expects $OCI_YML variable which should be the path to the dockerfile
+# Expects $DOCKERFILE variable which should be the path to the dockerfile
 # Expects $CONTEXT_DIR variable which should be the name of the parrent folder of the dockerfile
 .base:
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -f ${OCI_YML} -t ${IMAGE} ${CONTEXT_DIR}
+    - docker build --pull -f ${DOCKERFILE} -t ${IMAGE} ${CONTEXT_DIR}
     - docker push ${IMAGE}
 
 # Expects $ARCH variable which should be the architexcture of the image ex. x86_64
 # Expects $DISTRO_NAME variable which should be the name of the distro image ex. ubuntu
 # Expects $DISTRO_VER variable which should be the version distro image ex. 18.04
-# Expects $OCI_YML variable which should be the path to the dockerfile
+# Expects $DOCKERFILE variable which should be the path to the dockerfile
 .distro_template: &distro_build
     stage: distro
     before_script:
@@ -37,9 +37,9 @@ stages:
     stage: rustc
     before_script:
         - export IMAGE=${CI_REGISTRY_IMAGE}/rustc:${TAG_VERSION}
-        - export OCI_YML=rustc/rustc.yml
+        - export DOCKERFILE=rustc/rustc
         - export CONTEXT_DIR=rustc/
-        - sed -e "s|@RUSTC_VERSION@|$RUSTC_VERSION|" rustc/rustc_template > rustc/rustc.yml
+        - sed -e "s|@RUSTC_VERSION@|$RUSTC_VERSION|" rustc/rustc_template > rustc/rustc
     extends: '.base'
     only:
         changes:
@@ -50,7 +50,7 @@ fedora latest:
       ARCH: "amd64"
       DISTRO_NAME: "fedora"
       DISTRO_VER: "latest"
-      OCI_YML: "fedora/latest.yml"
+      DOCKERFILE: "fedora/latest"
       CONTEXT_DIR: "fedora"
     only:
         changes:
@@ -63,7 +63,7 @@ fedora rawhide:
       ARCH: "amd64"
       DISTRO_NAME: "fedora"
       DISTRO_VER: "rawhide"
-      OCI_YML: "fedora/rawhide.yml"
+      DOCKERFILE: "fedora/rawhide"
       CONTEXT_DIR: "fedora"
     only:
         changes:
@@ -77,7 +77,7 @@ debian testing:
       ARCH: "amd64"
       DISTRO_NAME: "debian"
       DISTRO_VER: "testing"
-      OCI_YML: "debian/testing.yml"
+      DOCKERFILE: "debian/testing"
       CONTEXT_DIR: "debian"
     only:
         changes:
@@ -90,7 +90,7 @@ opensuse tumbleweed:
       ARCH: "amd64"
       DISTRO_NAME: "opensuse"
       DISTRO_VER: "tumbleweed"
-      OCI_YML: "opensuse/tumbleweed.yml"
+      DOCKERFILE: "opensuse/tumbleweed"
       CONTEXT_DIR: "opensuse"
     only:
         changes:
@@ -103,7 +103,7 @@ ubuntu 18.04 x86_64:
       ARCH: "amd64"
       DISTRO_NAME: "ubuntu"
       DISTRO_VER: "18.04"
-      OCI_YML: "debian/bionic.yml"
+      DOCKERFILE: "debian/bionic"
       CONTEXT_DIR: "debian"
     only:
         changes:
@@ -116,7 +116,7 @@ debian testing i386:
       ARCH: "i386"
       DISTRO_NAME: "debian"
       DISTRO_VER: "testing"
-      OCI_YML: "debian/i386_testing.yml"
+      DOCKERFILE: "debian/i386_testing"
       CONTEXT_DIR: "debian"
     only:
         changes:
@@ -129,7 +129,7 @@ ubuntu 18.04 i386:
       ARCH: "i386"
       DISTRO_NAME: "ubuntu"
       DISTRO_VER: "18.04"
-      OCI_YML: "debian/i386_bionic.yml"
+      DOCKERFILE: "debian/i386_bionic"
       CONTEXT_DIR: "debian"
     only:
         changes:
diff --git a/debian/bionic.yml b/debian/bionic
similarity index 100%
rename from debian/bionic.yml
rename to debian/bionic
diff --git a/debian/i386_bionic.yml b/debian/i386_bionic
similarity index 100%
rename from debian/i386_bionic.yml
rename to debian/i386_bionic
diff --git a/debian/i386_testing.yml b/debian/i386_testing
similarity index 100%
rename from debian/i386_testing.yml
rename to debian/i386_testing
diff --git a/debian/testing.yml b/debian/testing
similarity index 100%
rename from debian/testing.yml
rename to debian/testing
diff --git a/fedora/latest.yml b/fedora/latest
similarity index 100%
rename from fedora/latest.yml
rename to fedora/latest
diff --git a/fedora/rawhide.yml b/fedora/rawhide
similarity index 100%
rename from fedora/rawhide.yml
rename to fedora/rawhide
diff --git a/opensuse/tumbleweed.yml b/opensuse/tumbleweed
similarity index 100%
rename from opensuse/tumbleweed.yml
rename to opensuse/tumbleweed