Skip to content

Commit 7f00588

Browse files
danisladanisla
committed
fixes to workflow and example image
1 parent 0cfd39f commit 7f00588

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

‎.github/workflows/build_and_publish_all_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ jobs:
8282
include:
8383
- name: gst-py-example
8484
version_suffix: -ubuntu20.04
85-
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=${{ github.ref_name }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:${{ github.ref_name }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:${{ github.ref_name }};JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:${{ github.ref_name }}
85+
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=${{ github.ref_name }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:${{ github.ref_name }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:${{ github.ref_name }};JS_BASE_IMAGE_RELEASE=${{ github.ref_name }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
8686
dockerfile: Dockerfile.example
8787
source_directory: .
8888

8989
- name: gst-py-example
9090
version_suffix: -ubuntu22.04
91-
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=${{ github.ref_name }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:${{ github.ref_name }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:${{ github.ref_name }};JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:${{ github.ref_name }}
91+
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=${{ github.ref_name }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:${{ github.ref_name }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:${{ github.ref_name }};JS_BASE_IMAGE_RELEASE=${{ github.ref_name }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
9292
dockerfile: Dockerfile.example
9393
source_directory: .
9494

‎.github/workflows/build_changed_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: gst-py-example
106106
version_suffix: -ubuntu20.04
107107
push_image: "false"
108-
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:pr${{ matrix.version_suffix }}
108+
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
109109
dockerfile: Dockerfile.example
110110
source_directory: .
111111
source_files_for_diff: |
@@ -120,7 +120,7 @@ jobs:
120120
- name: gst-py-example
121121
version_suffix: -ubuntu22.04
122122
push_image: "false"
123-
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:pr${{ matrix.version_suffix }}
123+
build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
124124
dockerfile: Dockerfile.example
125125
source_directory: .
126126
source_files_for_diff: |

‎.github/workflows/publish_release.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ jobs:
9999
include:
100100
- name: gst-py-example
101101
version_suffix: -ubuntu20.04
102-
build_args: PACKAGE_VERSION=${{ needs.get_semver.outputs.semver }};UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:$GITHUB_REF_NAME;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:$GITHUB_REF_NAME;JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:$GITHUB_REF_NAME
102+
build_args: PACKAGE_VERSION=${{ needs.get_semver.outputs.semver }};UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:$GITHUB_REF_NAME;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:$GITHUB_REF_NAME;JS_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
103103
dockerfile: Dockerfile.example
104104
source_directory: .
105105

106106
- name: gst-py-example
107107
version_suffix: -ubuntu22.04
108-
build_args: PACKAGE_VERSION=${{ needs.get_semver.outputs.semver }};UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:$GITHUB_REF_NAME;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:$GITHUB_REF_NAME;JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:$GITHUB_REF_NAME
108+
build_args: PACKAGE_VERSION=${{ needs.get_semver.outputs.semver }};UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:$GITHUB_REF_NAME;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:$GITHUB_REF_NAME;JS_BASE_IMAGE_RELEASE=$GITHUB_REF_NAME;JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
109109
dockerfile: Dockerfile.example
110110
source_directory: .
111111

@@ -279,11 +279,11 @@ jobs:
279279
key: ${{ needs.all_assets.outputs.js20_cache_key }}
280280
path: ${{ needs.all_assets.outputs.js20_path }}
281281

282-
- name: Ubuntu 22.04 cache read
282+
- name: JS Interposer Ubuntu 22.04 cache read
283283
uses: actions/cache@v3
284284
with:
285-
key: ${{ needs.all_assets.outputs.gst22_cache_key }}
286-
path: ${{ needs.all_assets.outputs.gst22_path }}
285+
key: ${{ needs.all_assets.outputs.js22_cache_key }}
286+
path: ${{ needs.all_assets.outputs.js22_path }}
287287

288288
- name: Python cache read
289289
uses: actions/cache@v3
@@ -315,7 +315,7 @@ jobs:
315315
asset_name: ${{ needs.all_assets.outputs.gst22_name }}
316316
overwrite: true
317317

318-
- name: JS Interceptor Ubuntu 20.04 upload
318+
- name: JS Interposer Ubuntu 20.04 upload
319319
uses: svenstaro/upload-release-action@v2
320320
with:
321321
repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -324,7 +324,7 @@ jobs:
324324
asset_name: ${{ needs.all_assets.outputs.js20_name }}
325325
overwrite: true
326326

327-
- name: JS Interceptor Ubuntu 22.04 upload
327+
- name: JS Interposer Ubuntu 22.04 upload
328328
uses: svenstaro/upload-release-action@v2
329329
with:
330330
repo_token: ${{ secrets.GITHUB_TOKEN }}

‎Dockerfile.example‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ ARG GSTREAMER_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gstreamer
88
ARG GSTREAMER_BASE_IMAGE_RELEASE=main
99
ARG PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:main
1010
ARG WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:main
11-
ARG JS_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer:main
11+
ARG JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
12+
ARG JS_BASE_IMAGE_RELEASE=main
1213
FROM ${GSTREAMER_BASE_IMAGE}:${GSTREAMER_BASE_IMAGE_RELEASE}-ubuntu${UBUNTU_RELEASE} as selkies-gstreamer
1314
FROM ${PY_BUILD_IMAGE} as selkies-build
1415
FROM ${WEB_IMAGE} as selkies-web
15-
FROM ${JS_IMAGE}-ubuntu${UBUNTU_RELEASE} as selkies-js-interposer
16+
FROM ${JS_BASE_IMAGE}:${JS_BASE_IMAGE_RELEASE}-ubuntu${UBUNTU_RELEASE} as selkies-js-interposer
1617
FROM ubuntu:${UBUNTU_RELEASE}
1718
ARG UBUNTU_RELEASE
1819

0 commit comments

Comments
 (0)