From b8fa6db8733e25d35d09f53cdb0a0fd66384e894 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Mon, 27 Apr 2020 11:10:26 +0300
Subject: [PATCH] docker/windows: add script to build the image with the
 correct branch and tag

also move the default_branch arg later in the dockerfile to
avoid invalidating previous layers

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/287>
---
 docker/windows/.dockerignore   | 1 +
 docker/windows/Dockerfile      | 4 ++--
 docker/windows/build_image.ps1 | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 docker/windows/.dockerignore
 create mode 100644 docker/windows/build_image.ps1

diff --git a/docker/windows/.dockerignore b/docker/windows/.dockerignore
new file mode 100644
index 0000000000..76bab46af2
--- /dev/null
+++ b/docker/windows/.dockerignore
@@ -0,0 +1 @@
+build_image.ps1
diff --git a/docker/windows/Dockerfile b/docker/windows/Dockerfile
index cb6c89f6c6..899fcfa33e 100644
--- a/docker/windows/Dockerfile
+++ b/docker/windows/Dockerfile
@@ -6,13 +6,13 @@ FROM 'mcr.microsoft.com/windows/servercore:ltsc2019'
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 ENV ErrorActionPreference='Stop'
 
-ARG DEFAULT_BRANCH="master"
-
 COPY install_choco.ps1 C:\
 RUN C:\install_choco.ps1
 
 COPY install_toolchain.ps1 C:\
 RUN C:\install_toolchain.ps1
 
+ARG DEFAULT_BRANCH="master"
+
 COPY prepare_gst_env.ps1 C:\
 RUN C:\prepare_gst_env.ps1
diff --git a/docker/windows/build_image.ps1 b/docker/windows/build_image.ps1
new file mode 100644
index 0000000000..9b1e26b856
--- /dev/null
+++ b/docker/windows/build_image.ps1
@@ -0,0 +1,5 @@
+$env:DEFAULT_BRANCH='master'
+$env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v10-$env:DEFAULT_BRANCH"
+echo "Building $env:tag"
+docker build --build-arg DEFAULT_BRANCH=$env:DEFAULT_BRANCH -f Dockerfile -t $env:tag .
+# docker push $tag