From ccf378cb1ffe26a2599c665dabbf60fb108060a7 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 25 Dec 2023 10:39:01 +0800 Subject: [PATCH] Fix bug: Remove HTTP port for SRS. v5.13.4 --- .github/workflows/pullrequest.yml | 4 ++-- .github/workflows/test.yml | 6 +++--- DEVELOPER.md | 14 ++++++-------- scripts/tools/local-test-all.sh | 3 +-- test/main_test.go | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index bd72598e..1543c240 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -109,7 +109,7 @@ jobs: docker load -i platform.tar docker tag platform ossrs/srs-stack:5 docker run --rm -d -p 2022:2022 -p 2443:2443 -p 1935:1935 \ - -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ + -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ -v /data:/data -e REACT_APP_LOCALE=zh ossrs/srs-stack:5 - name: Check and Test service run: | @@ -181,7 +181,7 @@ jobs: docker load -i platform.tar docker tag platform ossrs/srs-stack:5 docker run --rm -d -p 2022:2022 -p 2443:2443 -p 1935:1935 \ - -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ + -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ -v /data:/data -e REACT_APP_LOCALE=en ossrs/srs-stack:5 - name: Check and Test service run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e89dc88a..ad92ec0c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,7 @@ jobs: docker load -i platform.tar docker tag platform ossrs/srs-stack:5 docker run --rm -d -p 2022:2022 -p 2443:2443 -p 1935:1935 \ - -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ + -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ -v /data:/data -e REACT_APP_LOCALE=en ossrs/srs-stack:5 - name: Check and Test service env: @@ -185,7 +185,7 @@ jobs: # Note that we must mount the /data to allow test to read the MGMT_PASSWORD in /data/config/.env docker run -v /data:/data -p 80:80 -p 443:443 -p 7800:7800 \ - -p 2022:2022 -p 1935:1935 -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp \ + -p 2022:2022 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \ -v $(pwd)/build/srs_stack:/www/server/panel/plugin/srs_stack \ -v $HOME/.bt/userInfo.json:/www/server/panel/data/userInfo.json \ -v $HOME/.bt/api.json:/www/server/panel/config/api.json -e BT_KEY=$BT_KEY \ @@ -351,7 +351,7 @@ jobs: # Note that we must mount the /data to allow test to read the MGMT_PASSWORD in /data/config/.env docker run -v /data:/data -p 80:80 -p 443:443 -p 7800:7800 \ - -p 2022:2022 -p 1935:1935 -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp \ + -p 2022:2022 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \ -v $(pwd)/build/srs_stack:/www/server/panel/plugin/srs_stack \ -v $HOME/.aapanel/api.json:/www/server/panel/config/api.json -e BT_KEY=$AAPANEL_KEY \ --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ diff --git a/DEVELOPER.md b/DEVELOPER.md index db165553..8df81b41 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -111,8 +111,7 @@ Create a docker container in daemon: ```bash docker rm -f script 2>/dev/null && -docker run -p 2022:2022 -p 2443:2443 -p 1935:1935 \ - -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp \ +docker run -p 2022:2022 -p 2443:2443 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \ --env CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \ --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host \ -d --rm -it -v $(pwd):/g -w /g --name=script srs-script-dev @@ -176,8 +175,7 @@ Start a container and mount as plugin: ```bash docker rm -f bt aapanel 2>/dev/null && AAPANEL_KEY=$(cat $HOME/.bt/api.json |awk -F token_crypt '{print $2}' |cut -d'"' -f3) && -docker run -p 80:80 -p 443:443 -p 7800:7800 \ - -p 1935:1935 -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp \ +docker run -p 80:80 -p 443:443 -p 7800:7800 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \ --env CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \ -v $(pwd)/build/srs_stack:/www/server/panel/plugin/srs_stack \ -v $HOME/.bt/api.json:/www/server/panel/config/api.json -e BT_KEY=$AAPANEL_KEY \ @@ -277,8 +275,7 @@ Start a container and mount as plugin: ```bash docker rm -f bt aapanel 2>/dev/null && BT_KEY=$(cat $HOME/.bt/api.json |awk -F token_crypt '{print $2}' |cut -d'"' -f3) && -docker run -p 80:80 -p 443:443 -p 7800:7800 \ - -p 1935:1935 -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp \ +docker run -p 80:80 -p 443:443 -p 7800:7800 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \ --env CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \ -v $(pwd)/build/srs_stack:/www/server/panel/plugin/srs_stack \ -v $HOME/.bt/userInfo.json:/www/server/panel/data/userInfo.json \ @@ -818,8 +815,8 @@ Run SRS Stack by docker: ```bash docker run --rm -it -p 2022:2022 -p 2443:2443 -p 1935:1935 \ - -p 8080:8080 -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ - --env CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \ + -p 8000:8000/udp -p 10080:10080/udp --name srs-stack \ + --env CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \ -v $HOME/data:/data srs-stack-env ``` @@ -1059,6 +1056,7 @@ The following are the update records for the SRS Stack server. * Fix bug for vlive and transcript. v5.13.1 * Support AWS Lightsail install script. v5.13.2 * Limits: Support limit bitrate for VLive stream. v5.13.3 + * Fix bug: Remove HTTP port for SRS. v5.13.4 * v5.12 * Refine local variable name conf to config. v5.12.1 * Add forced exit on timeout for program termination. v5.12.1 diff --git a/scripts/tools/local-test-all.sh b/scripts/tools/local-test-all.sh index 4a9dc273..8b5dcb88 100755 --- a/scripts/tools/local-test-all.sh +++ b/scripts/tools/local-test-all.sh @@ -67,8 +67,7 @@ if [[ $TARGET == all || $TARGET == script ]]; then echo "Run script dev docker image" && docker rm -f $CONTAINERS 2>/dev/null || echo 'OK' && - docker run -p 2022:2022 -p 1935:1935/tcp -p 1985:1985/tcp \ - -p 8080:8080/tcp -p 8000:8000/udp -p 10080:10080/udp \ + docker run -p 2022:2022 -p 1935:1935/tcp -p 8000:8000/udp -p 10080:10080/udp \ --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host \ -d --rm -it -v $(pwd):/g -w /g --name=script srs-script-dev && echo "Waiting for the container to be ready..." && sleep 3 && echo "OK" diff --git a/test/main_test.go b/test/main_test.go index 8796c5f9..b7f19690 100644 --- a/test/main_test.go +++ b/test/main_test.go @@ -193,7 +193,7 @@ func prepareTest(ctx context.Context) (err error) { checkApiSecret = flag.Bool("check-api-secret", true, "Whether check the api secret") endpoint = flag.String("endpoint", "http://localhost:2022", "The endpoint for api, can be http or https") endpointRTMP = flag.String("endpoint-rtmp", "rtmp://localhost:1935", "The endpoint for rtmp") - endpointHTTP = flag.String("endpoint-http", "http://localhost:8080", "The endpoint for http") + endpointHTTP = flag.String("endpoint-http", "http://localhost:2022", "The endpoint for http") endpointSRT = flag.String("endpoint-srt", "srt://localhost:10080", "The endpoint for srt") forceHttps = flag.Bool("force-https", false, "Force to use HTTPS api") waitReady = flag.Bool("wait-ready", false, "Whether wait for the service ready")