Skip to content

Commit

Permalink
Fix bug: Remove HTTP port for SRS. v5.13.4
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Dec 25, 2023
1 parent 5aa7258 commit ccf378c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
14 changes: 6 additions & 8 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
```

Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/tools/local-test-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit ccf378c

Please sign in to comment.