From d9604ca8d21396e900cdcb3c9a36edb9d9fbd197 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Mon, 5 Nov 2018 20:52:37 +0200
Subject: [PATCH] Build the docker images and push them to the gitalb registry

---
 .gitlab-ci.yml                             | 53 +++++++++++++++++++++-
 docker/build-base-images/Dockerfile-fedora |  2 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3497e7d25c..d32d7de227 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 stages:
   - test
+  - "build runtime"
+  - "build base"
 
 test manifest:
   image: "fedora"
@@ -12,4 +14,53 @@ test manifest:
   artifacts:
     reports:
       junit:
-        - "junit.xml"
\ No newline at end of file
+        - "junit.xml"
+
+.base:
+  image: "docker:stable"
+  services:
+    - docker:dind
+  variables:
+    # When using dind, it's wise to use the overlayfs driver for
+    # improved performance.
+    DOCKER_DRIVER: "overlay2"
+  script:
+    - export IMAGE="${CI_REGISTRY_IMAGE}/${ARCH}/${TAG}"
+    - export REF="${IMAGE}:${CI_COMMIT_SHA}"
+    - export LATEST="${IMAGE}:latest"
+
+    - docker build --pull -f ${DOCKERFILE} -t ${REF} ${CONTEXT_DIR}
+    - docker image tag ${REF} ${LATEST}
+
+    # Push the images
+    - |
+      if [ "$CI_COMMIT_REF_NAME" = "master" ]; then
+        docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        docker push ${REF}
+        docker push ${LATEST}
+      fi
+  only:
+    changes:
+      - ".gitlab-ci.yml"
+      - "docker/**"
+      - "docker/*/**"
+
+
+fedora amd64 run:
+  stage: "build runtime"
+  variables:
+    ARCH: "amd64"
+    TAG: "fedora-runtime"
+    CONTEXT_DIR: "docker/runtime-images/"
+    DOCKERFILE: "docker/runtime-images/Dockerfile-fedora"
+  extends: .base
+
+fedora amd64 build:
+  stage: "build base"
+  variables:
+    ARCH: "amd64"
+    TAG: "fedora-build"
+    CONTEXT_DIR: "docker/build-base-images/"
+    DOCKERFILE: "docker/build-base-images/Dockerfile-fedora"
+  extends: .base
+
diff --git a/docker/build-base-images/Dockerfile-fedora b/docker/build-base-images/Dockerfile-fedora
index 14faa1cf67..852080c42c 100644
--- a/docker/build-base-images/Dockerfile-fedora
+++ b/docker/build-base-images/Dockerfile-fedora
@@ -1,4 +1,4 @@
-FROM registry.freedesktop.org/thiblahute/gst-ci/fedora-runtime
+FROM registry.freedesktop.org/thiblahute/gst-ci/amd64/fedora-runtime
 
 # Add rpmfusion repositories and install all build dependencies of GStreamer
 RUN dnf builddep -y \