Phase out Ubuntu 18.04 (Bionic)

selkies-project · Aug 17, 2023 · 01071c1 · 01071c1
1 parent 736292c
commit 01071c1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 77 deletions.
diff --git a/.github/workflows/build_and_publish_all_images.yaml b/.github/workflows/build_and_publish_all_images.yaml
@@ -28,11 +28,6 @@ jobs:
           - name: gst-web
             source_directory: addons/gst-web
 
-          - name: gstreamer
-            version_suffix: -ubuntu18.04
-            build_args: UBUNTU_RELEASE=18.04
-            source_directory: addons/gstreamer
-
           - name: gstreamer
             version_suffix: -ubuntu20.04
             build_args: UBUNTU_RELEASE=20.04
@@ -71,12 +66,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: gst-py-example
-            version_suffix: -ubuntu18.04
-            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=18.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 }}
-            dockerfile: Dockerfile.example
-            source_directory: .
-
           - name: gst-py-example
             version_suffix: -ubuntu20.04
             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 }}

diff --git a/.github/workflows/build_and_publish_changed_images.yaml b/.github/workflows/build_and_publish_changed_images.yaml
@@ -29,12 +29,6 @@ jobs:
             source_directory: addons/gst-web
             source_files_for_diff: addons/gst-web
 
-          - name: gstreamer
-            version_suffix: -ubuntu18.04
-            build_args: UBUNTU_RELEASE=18.04
-            source_directory: addons/gstreamer
-            source_files_for_diff: addons/gstreamer
-
           - name: gstreamer
             version_suffix: -ubuntu20.04
             build_args: UBUNTU_RELEASE=20.04
@@ -91,20 +85,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: gst-py-example
-            version_suffix: -ubuntu18.04
-            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=18.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 }}
-            dockerfile: Dockerfile.example
-            source_directory: .
-            source_files_for_diff: |
-              addons
-              src
-              Dockerfile
-              Dockerfile.example
-              pyproject.toml
-              setup.cfg
-              .github/workflows/build_and_publish_changed_images.yaml
-
           - name: gst-py-example
             version_suffix: -ubuntu20.04
             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 }}

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -37,11 +37,6 @@ jobs:
           - name: gst-web
             source_directory: addons/gst-web
 
-          - name: gstreamer
-            version_suffix: -ubuntu18.04
-            build_args: UBUNTU_RELEASE=18.04
-            source_directory: addons/gstreamer
-
           - name: gstreamer
             version_suffix: -ubuntu20.04
             build_args: UBUNTU_RELEASE=20.04
@@ -83,12 +78,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: gst-py-example
-            version_suffix: -ubuntu18.04
-            build_args: PACKAGE_VERSION=${{ needs.get_semver.outputs.semver }};UBUNTU_RELEASE=18.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
-            dockerfile: Dockerfile.example
-            source_directory: .
-
           - name: gst-py-example
             version_suffix: -ubuntu20.04
             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
@@ -123,10 +112,6 @@ jobs:
       - get_semver
     runs-on: ubuntu-latest
     outputs:
-      gst18_cache_key: ${{ steps.extract.outputs.gst18_cache_key }}
-      gst18_mimetype: ${{ steps.extract.outputs.gst18_mimetype }}
-      gst18_name: ${{ steps.extract.outputs.gst18_name }}
-      gst18_path: ${{ steps.extract.outputs.gst18_path }}
       gst20_cache_key: ${{ steps.extract.outputs.gst20_cache_key }}
       gst20_mimetype: ${{ steps.extract.outputs.gst20_mimetype }}
       gst20_name: ${{ steps.extract.outputs.gst20_name }}
@@ -146,16 +131,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - id: gst18
-            cache_key: gstreamer-asset-ubuntu1804
-            description: Ubuntu 18.04
-            image_tag: ghcr.io/selkies-project/selkies-gstreamer/gstreamer:${{ github.ref_name }}-ubuntu18.04
-            mimetype: application/tar+gzip
-            source_path: /opt/selkies-gstreamer-latest.tgz
-            target_directory: /tmp
-            target_name: selkies-gstreamer-${{ github.ref_name }}-ubuntu18.04.tgz
-            upload_bucket_path: gs://selkies-project-releases/selkies-gstreamer/${{ github.ref_name }}/
-
           - id: gst20
             cache_key: gstreamer-asset-ubuntu2004
             description: Ubuntu 20.04
@@ -238,12 +213,6 @@ jobs:
       - all_example_images
       - all_assets
     steps:
-      - name: Ubuntu 18.04 cache read
-        uses: actions/cache@v3
-        with:
-          key: ${{ needs.all_assets.outputs.gst18_cache_key }}
-          path: ${{ needs.all_assets.outputs.gst18_path }}
-
       - name: Ubuntu 20.04 cache read
         uses: actions/cache@v3
         with:
@@ -278,16 +247,6 @@ jobs:
           release_name: Release ${{ github.ref_name }}
           tag_name: ${{ github.ref_name }}
 
-      - name: Ubuntu 18.04 upload
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_content_type: ${{ needs.all_assets.outputs.gst18_mimetype }}
-          asset_name: ${{ needs.all_assets.outputs.gst18_name }}
-          asset_path: ${{ needs.all_assets.outputs.gst18_path }}
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-
       - name: Ubuntu 20.04 upload
         uses: actions/upload-release-asset@v1
         env:

diff --git a/Dockerfile.example b/Dockerfile.example
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-# Supported base images: ubuntu:22.04, ubuntu:20.04, ubuntu:18.04
+# Supported base images: ubuntu:22.04, ubuntu:20.04
 ARG UBUNTU_RELEASE=22.04
 ARG GSTREAMER_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gstreamer
 ARG GSTREAMER_BASE_IMAGE_RELEASE=master

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Fourth, `selkies-gstreamer` is easy to use and expand to various usage cases, at
 
 ## How do I get started?
 
-Three components are required to run `selkies-gstreamer`: the [standalone build of GStreamer](addons/gstreamer) with the most recent version, the [Python package](src/selkies_gstreamer) including the signaling server, and the [HTML5 web interface](addons/gst-web). Currently, Ubuntu 18.04 (Mint 19), 20.04 (Mint 20), 22.04 (Mint 21) are supported, but other operating systems should also work if using your own GStreamer build of the newest version (contributions for build workflows of more operating systems are welcome).
+Three components are required to run `selkies-gstreamer`: the [standalone build of GStreamer](addons/gstreamer) with the most recent version, the [Python package](src/selkies_gstreamer) including the signaling server, and the [HTML5 web interface](addons/gst-web). Currently, 20.04 (Mint 20), 22.04 (Mint 21) are supported, but other operating systems should also work if using your own GStreamer build of the newest version (contributions for build workflows of more operating systems are welcome).
 
 All three of the components are built and packaged [every release](https://github.com/selkies-project/selkies-gstreamer/releases). In addition, every latest commit gets built and is made available in container forms [`ghcr.io/selkies-project/selkies-gstreamer/gstreamer`](https://github.com/selkies-project/selkies-gstreamer/pkgs/container/selkies-gstreamer%2Fgstreamer), [`ghcr.io/selkies-project/selkies-gstreamer/py-build`](https://github.com/selkies-project/selkies-gstreamer/pkgs/container/selkies-gstreamer%2Fpy-build), and [`ghcr.io/selkies-project/selkies-gstreamer/gst-web`](https://github.com/selkies-project/selkies-gstreamer/pkgs/container/selkies-gstreamer%2Fgst-web).
 
@@ -38,7 +38,7 @@ Example Google Compute Engine/Google Kubernetes Engine deployment configurations
 
 An example image [`ghcr.io/selkies-project/selkies-gstreamer/gst-py-example`](https://github.com/selkies-project/selkies-gstreamer/pkgs/container/selkies-gstreamer%2Fgst-py-example) from the base [example Dockerfile](./Dockerfile.example) is available.
 
-Run the docker container built from the [`Dockerfile.example`](./Dockerfile.example), then connect to port **8080** of your Docker host to access the web interface (**replace `latest` to `master` for the development build instead of the release build, and choose the Ubuntu versions `18.04`, `20.04`, or `22.04`**):
+Run the docker container built from the [`Dockerfile.example`](./Dockerfile.example), then connect to port **8080** of your Docker host to access the web interface (**replace `latest` to `master` for the development build instead of the release build, and choose the Ubuntu versions `20.04`, or `22.04`**):
 
 ```bash
 docker run --name selkies -it --rm -p 8080:8080 ghcr.io/selkies-project/selkies-gstreamer/gst-py-example:latest-ubuntu20.04

diff --git a/addons/gstreamer/Dockerfile b/addons/gstreamer/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Install meson and ninja
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         python3-pip \
-        python-gi-dev \
+        python3-gi-dev \
         ninja-build && \
     rm -rf /var/lib/apt/lists/* && \
     pip3 install meson

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -72,7 +72,7 @@ services:
     volumes:
       - type: bind
         source: ./src/selkies_gstreamer
-        # Change python3.8 to python3.6 in 18.04 and python3.10 in 22.04
+        # Change python3.8 to python3.10 in 22.04
         target: /usr/local/lib/python3.8/dist-packages/selkies_gstreamer
         read_only: true