From 31ada1f1e9ccebbade11d4ca1b087176fe6a7dc0 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 29 Sep 2021 01:35:21 +0200 Subject: [PATCH] Docker: Updated CI image --- .github/workflows/ci.yml | 2 +- docker/README.md | 12 ++++++------ docker/ci-olive/Dockerfile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c04e620d1..08907fd3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: ${{ matrix.cmake-gen }}> runs-on: ubuntu-latest container: - image: olivevideoeditor/ci-olive:2021.3 + image: olivevideoeditor/ci-olive:2021.4 steps: - name: Checkout Source Code diff --git a/docker/README.md b/docker/README.md index 927d9a314..d70565bf7 100644 --- a/docker/README.md +++ b/docker/README.md @@ -27,14 +27,14 @@ docker pull olivevideoeditor/ci-package-otio docker pull olivevideoeditor/ci-package-crashpad docker pull olivevideoeditor/ci-package-ffmpeg:4.2.4 docker pull olivevideoeditor/ci-package-ocio:2021-2.0.0 -docker pull olivevideoeditor/ci-olive:2021.3 +docker pull olivevideoeditor/ci-olive:2021.4 ``` Use `ci-olive` image as local build container, by mounting working copy at `~/olive` into guest system at `/opt/olive/olive`: ```bash -docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2021.3 +docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2021.4 mkdir build cd build cmake .. -G Ninja @@ -50,11 +50,11 @@ docker build -t olivevideoeditor/ci-package-otio -f ci-otio/Dockerfile . docker build -t olivevideoeditor/ci-package-crashpad -f ci-crashpad/Dockerfile . docker build -t olivevideoeditor/ci-package-ffmpeg:4.2.4 -f ci-ffmpeg/Dockerfile . docker build -t olivevideoeditor/ci-package-ocio:2021-2.0.0 -f ci-ocio/Dockerfile . -docker build -t olivevideoeditor/ci-olive:2021.3 -f ci-olive/Dockerfile . +docker build -t olivevideoeditor/ci-olive:2021.4 -f ci-olive/Dockerfile . ``` -Note that `2021` in `ci-olive:2021.3` stands for the -[VFX Reference Platform](http://vfxplatform.com/) calendar year and `3` for the +Note that `2021` in `ci-olive:2021.4` stands for the +[VFX Reference Platform](http://vfxplatform.com/) calendar year and `4` for the build image revision (should be incremented each time a new image is published). Publish images: @@ -65,5 +65,5 @@ docker push olivevideoeditor/ci-package-otio docker push olivevideoeditor/ci-package-crashpad docker push olivevideoeditor/ci-package-ffmpeg:4.2.4 docker push olivevideoeditor/ci-package-ocio:2021-2.0.0 -docker push olivevideoeditor/ci-olive:2021.3 +docker push olivevideoeditor/ci-olive:2021.4 ``` diff --git a/docker/ci-olive/Dockerfile b/docker/ci-olive/Dockerfile index be763c649..ffdfd6ebd 100644 --- a/docker/ci-olive/Dockerfile +++ b/docker/ci-olive/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Build image (default): -# docker build -t olivevideoeditor/ci-olive:2021.3 -f ci-olive/Dockerfile . +# docker build -t olivevideoeditor/ci-olive:2021.4 -f ci-olive/Dockerfile . # # .n is the build image revision number. It should be incremented each time a # new image is published (also update the GitHub Actions workflow!).