Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ci deprecated and update versions #326

Merged
merged 13 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/almalinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/ams-utilizations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 12 additions & 4 deletions .github/workflows/ant-media-server-docker-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/centos.yml

This file was deleted.

10 changes: 2 additions & 8 deletions .github/workflows/rockylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/Dockerfile_RockyLinux
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions install_ant-media-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading