Merge branch 'master' into add-mongodb-azure-pv

.github/workflows/almalinux.yml

@@ -2,14 +2,8 @@ name: AlmaLinux
 on: [push]
 
 jobs:
-  Almalinux8:
-    runs-on: ubuntu-20.04
-    container: almalinux:8
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/deploy-almalinux
   Almalinux9:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container: almalinux:9
     steps:
       - uses: actions/checkout@v3

.github/workflows/ams-utilizations.yml

@@ -25,3 +25,12 @@ jobs:
       - name: Set up MongoDB
         run: |
           bash ./install_mongodb.sh
+  mongodb_install_ubuntu_24_04:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Set up MongoDB
+        run: |
+          bash ./install_mongodb.sh

.github/workflows/ant-media-server-docker-multi-platform.yml

@@ -5,6 +5,8 @@ on: [push]
 jobs:
   ams_ubuntu_docker_test:
     runs-on: ubuntu-latest
+    env:
+      BRANCH_NAME: ${{ github.ref_name }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -13,10 +15,10 @@ jobs:
         run: curl -L -o ant-media-server-community.zip $(curl -s https://api.github.com/repos/ant-media/Ant-Media-Server/releases/latest | grep "browser_download_url" | cut -d '"' -f 4)
 
       - name: Download Dockerfile
-        run: wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/master/docker/Dockerfile_Process -O Dockerfile
+        run: wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/$BRANCH_NAME/docker/Dockerfile_Process -O Dockerfile
 
       - name: Build Docker image
-        run: docker build --network=host -t antmediaserver:latest --build-arg AntMediaServer=ant-media-server-community.zip .
+        run: docker build --network=host -t antmediaserver:latest --build-arg AntMediaServer=ant-media-server-community.zip --build-arg BranchName=$BRANCH_NAME .
 
       - name: Run the image
         run: docker run -d -p 5080:5080 --name antmediaserver antmediaserver
@@ -43,6 +45,8 @@ jobs:
 
   ams_rockylinux_docker_test:
     runs-on: ubuntu-latest
+    env:
+      BRANCH_NAME: ${{ github.ref_name }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -51,10 +55,14 @@ jobs:
         run: curl -L -o ant-media-server-community.zip $(curl -s https://api.github.com/repos/ant-media/Ant-Media-Server/releases/latest | grep "browser_download_url" | cut -d '"' -f 4)
 
       - name: Download Dockerfile
-        run: wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/master/docker/Dockerfile_RockyLinux -O Dockerfile
+        run:  |
+          echo "Building Docker image with branch: $BRANCH_NAME" 
+          wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/$BRANCH_NAME/docker/Dockerfile_RockyLinux -O Dockerfile
 
       - name: Build Docker image
-        run: docker build --network=host -t antmediaserver:latest --build-arg AntMediaServer=ant-media-server-community.zip .
+        run:  |
+          echo "Building Docker image with branch: $BRANCH_NAME"
+          docker build --network=host -t antmediaserver:latest --build-arg AntMediaServer=ant-media-server-community.zip --build-arg BranchName=$BRANCH_NAME .
 
       - name: Run the image
         run: docker run -d -p 5080:5080 --name antmediaserver antmediaserver

.github/workflows/rockylinux.yml

@@ -2,15 +2,9 @@ name: RockyLinux
 on: [push]
 
 jobs:
-  RockyLinux8:
-    runs-on: ubuntu-20.04
-    container: rockylinux:8
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/deploy-rockylinux
   RockyLinux9:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container: rockylinux:9
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/deploy-rockylinux-9
+      - uses: ./.github/actions/deploy-rockylinux-9

docker/Dockerfile_RockyLinux

@@ -1,10 +1,10 @@
-FROM rockylinux/rockylinux:8.6
+FROM rockylinux/rockylinux:9.3
 ARG AntMediaServer
 
 ARG BranchName=master
 
 #Running update and install makes the builder not to use cache which resolves some updates
-RUN yum install -y curl wget iproute logrotate which findutils which crontabs unzip
+RUN yum install -y curl wget iproute logrotate which findutils which crontabs unzip --allowerasing
 
 ADD ./${AntMediaServer} /home
 

install_ant-media-server.sh

@@ -161,7 +161,7 @@ distro () {
   os_release="/etc/os-release"
   if [ -f "$os_release" ]; then
     . $os_release
-    msg="We are supporting Ubuntu 18.04, Ubuntu 20.04, Ubuntu 22.04, Ubuntu 24.04, Centos 8, Centos 9, RockyLinux 8, RockyLinux 9, AlmaLinux 8 and AlmaLinux 9"
+    msg="We are supporting Ubuntu 20.04, Ubuntu 22.04, Ubuntu 24.04, Centos 9, RockyLinux 9 and AlmaLinux 9"
     if [ "$OTHER_DISTRO" == "true" ]; then
       echo -e """\n- OpenJDK 11 (openjdk-11-jdk)\n- De-archiver (unzip)\n- Commons Daemon (jsvc)\n- Apache Portable Runtime Library (libapr1)\n- SSL Development Files (libssl-dev)\n- Video Acceleration (VA) API (libva-drm2)\n- Video Acceleration (VA) API - X11 runtime (libva-x11-2)\n- Video Decode and Presentation API Library (libvdpau-dev)\n- Crystal HD Video Decoder Library (libcrystalhd-dev)\n"""
       read -p 'Are you sure that the above packages are installed?  Y/N ' CUSTOM_PACKAGES
@@ -182,7 +182,7 @@ distro () {
         exit 1
       fi
 
-      if [[ $VERSION_ID != 18.04 ]] && [[ $VERSION_ID != 20.04 ]] && [[ $VERSION_ID != 22.04 ]] && [[ $VERSION_ID != 24.04 ]] && [[ $VERSION_ID != 8* ]] && [[ $VERSION_ID != 9* ]] && [[ $VERSION_ID != 12 ]] && [[ $VERSION_ID != 11 ]]; then
+      if [[ $VERSION_ID != 20.04 ]] && [[ $VERSION_ID != 22.04 ]] && [[ $VERSION_ID != 24.04 ]] && [[ $VERSION_ID != 9* ]] && [[ $VERSION_ID != 12 ]] && [[ $VERSION_ID != 11 ]]; then
          echo $msg
          exit 1
             fi