diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-04-27 11:10:26 +0300 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2020-05-25 16:06:50 +0300 |
| commit | cd3bbfc90c54487ad3261ecd7a2f01c76928149f (patch) | |
| tree | 6268dae875a30b435453e380c39802403ffdd9fa | |
| parent | 21daccb1bcda9ec14cfceb1675c669a68919bb2e (diff) | |
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>
| -rw-r--r-- | docker/windows/.dockerignore | 1 | ||||
| -rw-r--r-- | docker/windows/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/windows/build_image.ps1 | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/docker/windows/.dockerignore b/docker/windows/.dockerignore new file mode 100644 index 0000000..76bab46 --- /dev/null +++ b/docker/windows/.dockerignore @@ -0,0 +1 @@ +build_image.ps1 diff --git a/docker/windows/Dockerfile b/docker/windows/Dockerfile index 4675806..ec3e138 100644 --- a/docker/windows/Dockerfile +++ b/docker/windows/Dockerfile @@ -6,8 +6,10 @@ FROM 'mcr.microsoft.com/windows/servercore:ltsc2019' SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] ENV ErrorActionPreference='Stop' -COPY install_toolchain.ps1 prepare_gst_env.ps1 C:\ - +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 0000000..cd8c872 --- /dev/null +++ b/docker/windows/build_image.ps1 @@ -0,0 +1,5 @@ +$env:DEFAULT_BRANCH='1.16' +$env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-$env:DEFAULT_BRANCH" +echo "Building $env:tag" +docker build --build-arg DEFAULT_BRANCH=$env:DEFAULT_BRANCH -f Dockerfile -t $env:tag . +# docker push $tag |