Merge branch 'master' into add-supervisor-support

ant-media · Feb 16, 2025 · 3ba83af · 3ba83af
2 parents 8697913 + 39a7bf5
commit 3ba83af
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
@@ -47,7 +47,7 @@ jobs:
         
     - name: Install ChromeDriver
       run: |
-        wget https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.69/linux64/chromedriver-linux64.zip
+        wget https://storage.googleapis.com/chrome-for-testing-public/133.0.6943.98/linux64/chromedriver-linux64.zip
         unzip chromedriver-linux64.zip
         cd chromedriver-linux64
         sudo mv chromedriver /usr/bin/chromedriver

diff --git a/azure-arm-template/antmedia-azure-autoscale.yaml b/azure-arm-template/antmedia-azure-autoscale.yaml
@@ -428,7 +428,7 @@
             "properties": {
               "port": 5080,
               "protocol": "Http",
-              "cookieBasedAffinity": "Disabled",
+              "cookieBasedAffinity": "Enabled",
               "pickHostNameFromBackendAddress": false,
               "requestTimeout": 20
             }

diff --git a/cloudformation/antmedia-aws-autoscale-remote_db-template.yaml b/cloudformation/antmedia-aws-autoscale-remote_db-template.yaml
@@ -498,13 +498,12 @@ Resources:
             #!/bin/bash
             touch /usr/local/antmedia/conf/initialized
             bash /usr/local/antmedia/change_server_mode.sh cluster ${DBInstance.PrivateIp}
-            apt-get update 
-            apt-get install -y python3-pip
-            apt-get install -y python3-setuptools
+            sudo apt-get update 
+            sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            wget https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
-            python3 -m easy_install --script-dir /opt/aws/bin aws-cfn-bootstrap-py3-latest.tar.gz
-            /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource OriginGroup --region ${AWS::Region}
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
+            sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
+            /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource OriginGroup --region ${AWS::Region}
         TagSpecifications:
           - ResourceType: instance
             Tags:
@@ -574,13 +573,12 @@ Resources:
             #!/bin/bash
             touch /usr/local/antmedia/conf/initialized
             bash /usr/local/antmedia/change_server_mode.sh cluster ${DBInstance.PrivateIp}
-            apt-get update 
-            apt-get install -y python3-pip
-            apt-get install -y python3-setuptools
+            sudo apt-get update 
+            sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            wget https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
-            python3 -m easy_install --script-dir /opt/aws/bin aws-cfn-bootstrap-py3-latest.tar.gz
-            /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
+            sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
+            /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
         TagSpecifications:
           - ResourceType: instance
             Tags:

diff --git a/cloudformation/antmedia-aws-autoscale-template.yaml b/cloudformation/antmedia-aws-autoscale-template.yaml
@@ -599,7 +599,7 @@ Resources:
             apt-get update 
             sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
             sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
             /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource OriginGroup --region ${AWS::Region}
         TagSpecifications:
@@ -674,7 +674,7 @@ Resources:
             sudo apt-get update 
             sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
             sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
             /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
         TagSpecifications:

diff --git a/cloudformation/antmedia-aws-autoscale-with-monitoring-tool.yaml b/cloudformation/antmedia-aws-autoscale-with-monitoring-tool.yaml
@@ -583,13 +583,12 @@ Resources:
             #!/bin/bash
             touch /usr/local/antmedia/conf/initialized
             bash /usr/local/antmedia/change_server_mode.sh cluster ${DBInstance.PrivateIp}
-            apt-get update 
-            apt-get install -y python3-pip
-            apt-get install -y python3-setuptools
+            sudo apt-get update 
+            sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            wget https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
-            python3 -m easy_install --script-dir /opt/aws/bin aws-cfn-bootstrap-py3-latest.tar.gz
-            /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource OriginGroup --region ${AWS::Region}
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
+            sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
+            /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
         TagSpecifications:
           - ResourceType: instance
             Tags:
@@ -659,13 +658,12 @@ Resources:
             #!/bin/bash
             touch /usr/local/antmedia/conf/initialized
             bash /usr/local/antmedia/change_server_mode.sh cluster ${DBInstance.PrivateIp}
-            apt-get update 
-            apt-get install -y python3-pip
-            apt-get install -y python3-setuptools
+            sudo apt-get update 
+            sudo apt-get -y install python3-pip
             mkdir -p /opt/aws/bin
-            wget https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
-            python3 -m easy_install --script-dir /opt/aws/bin aws-cfn-bootstrap-py3-latest.tar.gz
-            /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
+            sudo pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
+            sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
+            /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource EdgeGroup --region ${AWS::Region}
         TagSpecifications:
           - ResourceType: instance
             Tags: