From cfdae6e64bf0e666aa8c249013fe3df167639a90 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 13:34:03 +0300 Subject: [PATCH 01/13] Remove RockyLinux 8 --- docker/Dockerfile_RockyLinux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_RockyLinux b/docker/Dockerfile_RockyLinux index bc59a87c..5aa56aff 100644 --- a/docker/Dockerfile_RockyLinux +++ b/docker/Dockerfile_RockyLinux @@ -1,4 +1,4 @@ -FROM rockylinux/rockylinux:8.6 +FROM rockylinux/rockylinux:9.3 ARG AntMediaServer ARG BranchName=master From 515407c26749f9ef284cc9360dcf5c1c2311179a Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 13:37:14 +0300 Subject: [PATCH 02/13] Remove AlmaLinux 8 support --- .github/workflows/almalinux.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/almalinux.yml b/.github/workflows/almalinux.yml index 91d82559..1f08af36 100644 --- a/.github/workflows/almalinux.yml +++ b/.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 From f2abb98abb3736d651089cd2e41cdeaac5c4b5aa Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 13:37:28 +0300 Subject: [PATCH 03/13] Remove Centos 8 support --- .github/workflows/centos.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index d69e3bec..9b0fbb07 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -3,9 +3,8 @@ on: [push] jobs: Centos8: - runs-on: ubuntu-20.04 - container: centos:8 + runs-on: ubuntu-24.04 + container: centos:9 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/deploy-centos - From 44ef24ee02e755a3cd2d79ba73404ed6a60520aa Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 13:37:50 +0300 Subject: [PATCH 04/13] Remove RockyLinux 8 support --- .github/workflows/rockylinux.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rockylinux.yml b/.github/workflows/rockylinux.yml index 85998ec4..576987af 100644 --- a/.github/workflows/rockylinux.yml +++ b/.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 \ No newline at end of file From 0bfa7e75daad8087c3a6fb6aa9a11edbb270eb94 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 13:38:21 +0300 Subject: [PATCH 05/13] Add Ubuntu 24.04 --- .github/workflows/ams-utilizations.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ams-utilizations.yml b/.github/workflows/ams-utilizations.yml index 27c3b3f5..5f58f848 100644 --- a/.github/workflows/ams-utilizations.yml +++ b/.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 \ No newline at end of file From ee108588ba3bfb04af7d37dca580fbd8b106d573 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 14:01:26 +0300 Subject: [PATCH 06/13] Remove support for Ubuntu 18.04 and RockyLinux, AlmaLinux CentOS 8 from the installation script --- install_ant-media-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ant-media-server.sh b/install_ant-media-server.sh index 71005f4d..6beb7008 100755 --- a/install_ant-media-server.sh +++ b/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 From f3b0bd3fc33af3c76a23f475129e2ac3d97e7599 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 16:33:49 +0300 Subject: [PATCH 07/13] Delete Centos Support --- .github/workflows/centos.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .github/workflows/centos.yml diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml deleted file mode 100644 index 9b0fbb07..00000000 --- a/.github/workflows/centos.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Centos -on: [push] - -jobs: - Centos8: - runs-on: ubuntu-24.04 - container: centos:9 - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/deploy-centos From 79ffed03fb28b0d549a622d8cf5b4105373ac9eb Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 19:18:30 +0300 Subject: [PATCH 08/13] Update install_ant-media-server.sh --- install_ant-media-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ant-media-server.sh b/install_ant-media-server.sh index 6beb7008..521153d6 100755 --- a/install_ant-media-server.sh +++ b/install_ant-media-server.sh @@ -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 From d100d3c1761c4ee50ade381a076da543913038fd Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 19:26:10 +0300 Subject: [PATCH 09/13] Add dynamic branch detection to Docker build in GitHub Actions --- .../workflows/ant-media-server-docker-multi-platform.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ant-media-server-docker-multi-platform.yml b/.github/workflows/ant-media-server-docker-multi-platform.yml index 7c24d03c..c8f04620 100644 --- a/.github/workflows/ant-media-server-docker-multi-platform.yml +++ b/.github/workflows/ant-media-server-docker-multi-platform.yml @@ -54,7 +54,11 @@ jobs: run: wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/master/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 . + env: + BRANCH_NAME: ${{ github.ref_name }} + 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 From d697596eafe6677836ce01228bd24b127886f78e Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 19:33:53 +0300 Subject: [PATCH 10/13] Update ant-media-server-docker-multi-platform.yml --- .../ant-media-server-docker-multi-platform.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ant-media-server-docker-multi-platform.yml b/.github/workflows/ant-media-server-docker-multi-platform.yml index c8f04620..fb63ac60 100644 --- a/.github/workflows/ant-media-server-docker-multi-platform.yml +++ b/.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 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,11 +55,9 @@ 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: wget --quiet https://raw.githubusercontent.com/ant-media/Scripts/$BRANCH_NAME/docker/Dockerfile_RockyLinux -O Dockerfile - name: Build Docker image - env: - BRANCH_NAME: ${{ github.ref_name }} 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 . From 59e4a0da540353a8cd5df1441e558457f982448f Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 19:35:58 +0300 Subject: [PATCH 11/13] Update ant-media-server-docker-multi-platform.yml --- .github/workflows/ant-media-server-docker-multi-platform.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ant-media-server-docker-multi-platform.yml b/.github/workflows/ant-media-server-docker-multi-platform.yml index fb63ac60..e54bd41b 100644 --- a/.github/workflows/ant-media-server-docker-multi-platform.yml +++ b/.github/workflows/ant-media-server-docker-multi-platform.yml @@ -55,7 +55,9 @@ 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/$BRANCH_NAME/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: | From 50ef604b97a48b3a1916373e5b830a1ba27d72b2 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 20:12:58 +0300 Subject: [PATCH 12/13] Update Dockerfile_RockyLinux --- docker/Dockerfile_RockyLinux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_RockyLinux b/docker/Dockerfile_RockyLinux index 5aa56aff..b92ca13e 100644 --- a/docker/Dockerfile_RockyLinux +++ b/docker/Dockerfile_RockyLinux @@ -4,7 +4,7 @@ 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 From 0688c0ac2adb8e5566f4f5806a3d70c61e54c8c8 Mon Sep 17 00:00:00 2001 From: Murat Ugur Eminoglu Date: Tue, 17 Dec 2024 20:15:40 +0300 Subject: [PATCH 13/13] Fix CI --- .github/workflows/ant-media-server-docker-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ant-media-server-docker-multi-platform.yml b/.github/workflows/ant-media-server-docker-multi-platform.yml index e54bd41b..840cab12 100644 --- a/.github/workflows/ant-media-server-docker-multi-platform.yml +++ b/.github/workflows/ant-media-server-docker-multi-platform.yml @@ -18,7 +18,7 @@ jobs: 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 BranchName=$BRANCH_NAME . + 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