Skip to content

Commit

Permalink
Rename SRS Stack to Oryx. v5.14.15
Browse files Browse the repository at this point in the history
1. Rename SRS Stack to Oryx.
2. Rename SRS_STACK to ORYX.
3. Rename srs-stack to oryx.
4. Rename srs_stack to oryx.
5. Keep /usr/local/srs-stack
  • Loading branch information
winlinvip committed Apr 7, 2024
1 parent 97c5996 commit 58edc13
Show file tree
Hide file tree
Showing 82 changed files with 875 additions and 868 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assignees: ''
A clear and concise description of what the bug is.

**Version**
Desribe your SRS Stack version here.
Desribe your Oryx version here.

**To Reproduce**
Steps to reproduce the behavior:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/api-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
# Build SRS image
- name: Build SRS docker image
run: |
echo "Release ossrs/srs-stack:$SRS_TAG"
docker build --tag ossrs/srs-stack:$SRS_TAG -f releases/Dockerfile .
echo "Release ossrs/oryx:$SRS_TAG"
docker build --tag ossrs/oryx:$SRS_TAG -f releases/Dockerfile .
# Create main images for Docker
- name: Login to docker hub
uses: docker/login-action@v2
Expand All @@ -54,8 +54,8 @@ jobs:
password: "${{ secrets.DOCKER_PASSWORD }}"
- name: Push to Docker hub
run: |
docker tag ossrs/srs-stack:$SRS_TAG ossrs/srs-stack:$SRS_MAJOR
docker push --all-tags ossrs/srs-stack
docker tag ossrs/oryx:$SRS_TAG ossrs/oryx:$SRS_MAJOR
docker push --all-tags ossrs/oryx
runs-on: ubuntu-20.04

aliyun:
Expand All @@ -74,13 +74,13 @@ jobs:
registry: registry.cn-hangzhou.aliyuncs.com
username: "${{ secrets.ACR_USERNAME }}"
password: "${{ secrets.ACR_PASSWORD }}"
- name: Docker alias images for ossrs/srs-stack
- name: Docker alias images for ossrs/oryx
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_TAG }}
src: ossrs/oryx:${{ env.SRS_TAG }}
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04

deploy:
Expand Down Expand Up @@ -121,14 +121,14 @@ jobs:
export SRS_DROPLET_PIP=$(ifconfig eth0 |grep 'inet ' |awk '{print $2}')
echo "SRS_DROPLET_PIP=$SRS_DROPLET_PIP"
#
# Restart SRS Stack release
# Restart Oryx release
cat << END > /root/restart_docs-stack.sh
# See https://github.com/ossrs/srs-stack
docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:$SRS_MAJOR
# See https://github.com/ossrs/oryx
docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:$SRS_MAJOR
docker rm -f docs-cloudversion || sleep 1
docker run -d -it --restart always --privileged --name docs-cloudversion -p 8101:9000 \\
--log-driver=json-file --log-opt=max-size=500m --log-opt=max-file=3 \\
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:$SRS_MAJOR
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:$SRS_MAJOR
END
bash /root/restart_docs-stack.sh
#
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ jobs:
password: "${{ secrets.DOCKER_PASSWORD }}"
- name: Build SRS docker image
run: |
echo "Release ossrs/srs-stack:$SRS_TAG"
echo "Release ossrs/oryx:$SRS_TAG"
docker buildx build --platform linux/amd64,linux/arm/v7,linux/arm64/v8 \
--output "type=image,push=true" \
--tag ossrs/srs-stack:$SRS_TAG -f focal/Dockerfile .
- name: Docker alias images for ossrs/srs-stack
--tag ossrs/oryx:$SRS_TAG -f focal/Dockerfile .
- name: Docker alias images for ossrs/oryx
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_TAG }}
src: ossrs/oryx:${{ env.SRS_TAG }}
dst: |
ossrs/srs-stack:${{ env.SRS_MAJOR }}
ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04

aliyun:
Expand All @@ -84,11 +84,11 @@ jobs:
registry: registry.cn-hangzhou.aliyuncs.com
username: "${{ secrets.ACR_USERNAME }}"
password: "${{ secrets.ACR_PASSWORD }}"
- name: Docker alias images for ossrs/srs-stack
- name: Docker alias images for ossrs/oryx
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_TAG }}
src: ossrs/oryx:${{ env.SRS_TAG }}
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
36 changes: 18 additions & 18 deletions .github/workflows/nginx-hls-cdn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,34 @@ jobs:
password: "${{ secrets.DOCKER_PASSWORD }}"
- name: Build HTTP docker image
run: |
echo "Release ossrs/srs-stack:$SRS_MAJOR_HTTP-$SRS_VERSION"
echo "Release ossrs/oryx:$SRS_MAJOR_HTTP-$SRS_VERSION"
docker buildx build --platform linux/amd64,linux/arm/v7,linux/arm64/v8 \
--output "type=image,push=true" \
--tag ossrs/srs-stack:$SRS_MAJOR_HTTP \
--tag ossrs/oryx:$SRS_MAJOR_HTTP \
-f scripts/nginx-hls-cdn/Dockerfile.http \
scripts/nginx-hls-cdn
- name: Alias HTTP docker image
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_MAJOR_HTTP }}
src: ossrs/oryx:${{ env.SRS_MAJOR_HTTP }}
dst: |
ossrs/srs-stack:${{ env.SRS_MAJOR_HTTP }}-${{ env.SRS_VERSION }}
ossrs/srs-stack:nginx-hls-cdn-${{ env.SRS_VERSION }}
ossrs/srs-stack:nginx-hls-cdn
ossrs/oryx:${{ env.SRS_MAJOR_HTTP }}-${{ env.SRS_VERSION }}
ossrs/oryx:nginx-hls-cdn-${{ env.SRS_VERSION }}
ossrs/oryx:nginx-hls-cdn
- name: Build HTTPS docker image
run: |
echo "Release ossrs/srs-stack:$SRS_MAJOR_HTTPS-$SRS_VERSION"
echo "Release ossrs/oryx:$SRS_MAJOR_HTTPS-$SRS_VERSION"
docker buildx build --platform linux/amd64,linux/arm/v7,linux/arm64/v8 \
--output "type=image,push=true" \
--tag ossrs/srs-stack:$SRS_MAJOR_HTTPS \
--tag ossrs/oryx:$SRS_MAJOR_HTTPS \
-f scripts/nginx-hls-cdn/Dockerfile.https \
scripts/nginx-hls-cdn
- name: Alias HTTPS docker image
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_MAJOR_HTTPS }}
src: ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}
dst: |
ossrs/srs-stack:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
runs-on: ubuntu-20.04

aliyun:
Expand All @@ -92,17 +92,17 @@ jobs:
- name: Alias HTTP docker images
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_MAJOR_HTTP }}
src: ossrs/oryx:${{ env.SRS_MAJOR_HTTP }}
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR_HTTP }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR_HTTP }}-${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:nginx-hls-cdn-${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:nginx-hls-cdn
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTP }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTP }}-${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:nginx-hls-cdn-${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:nginx-hls-cdn
- name: Alias HTTPS docker images
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ossrs/srs-stack:${{ env.SRS_MAJOR_HTTPS }}
src: ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR_HTTPS }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs-stack:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
runs-on: ubuntu-20.04
Loading

0 comments on commit 58edc13

Please sign in to comment.