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.

Sign up for GitHub

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

Docker: Refine the main dockerfile. v6.0.54 #3594

Merged
merged 3 commits into from
Jun 20, 2023
+18 −13
Merged

Docker: Refine the main dockerfile. v6.0.54 #3594

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c1e40b
Docker: Refine the main dockerfile.
winlinvip Jun 20, 2023
d7822ca
Merge branch 'develop' into feature/dockerfile
winlinvip Jun 20, 2023
1b107e7
Update release to v6.0.54
winlinvip Jun 20, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -267,7 +267,7 @@ jobs:
echo "Release ossrs/srs:$SRS_TAG"
docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
--output "type=image,push=true" \
-t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile .
-t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f Dockerfile .
# Docker alias images
# TODO: FIXME: If stable, please set the latest from 5.0 to 6.0
- name: Docker alias images for ossrs/srs
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -252,7 +252,7 @@ jobs:
--output "type=image,push=false" \
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
--build-arg INSTALLDEPENDS="NO" \
-f trunk/Dockerfile .
-f Dockerfile .
runs-on: ubuntu-20.04

multiple-arch-aarch64:
@@ -273,7 +273,7 @@ jobs:
--output "type=image,push=false" \
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
--build-arg INSTALLDEPENDS="NO" \
-f trunk/Dockerfile .
-f Dockerfile .
runs-on: ubuntu-20.04

multiple-arch-amd64:
@@ -295,7 +295,7 @@ jobs:
docker buildx build --platform linux/amd64 \
--output "type=image,push=false" \
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
-f trunk/Dockerfile .
-f Dockerfile .
runs-on: ubuntu-20.04

fast:
0 trunk/Dockerfile → Dockerfile
View file
File renamed without changes.
20 changes: 12 additions & 8 deletions trunk/doc/Dockers.md
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,14 @@
About SRS Dockerfile:

* Dockerfile: For release and test.
* Dockerfile.pkg: For package binary.
* Dockerfile.builds: For test.
* Dockerfile.test: For test.
* Dockerfile.cov: For test and coverage.
* trunk/Dockerfile.pkg: For package binary.
* trunk/Dockerfile.builds: For test.
* trunk/Dockerfile.test: For test.
* trunk/Dockerfile.cov: For test and coverage.

```bash
docker build -t srs -f Dockerfile .
```

## Dependency Tree

@@ -22,18 +26,18 @@ The dependency tree about Dockerfile:
* [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ubuntu20)
* ubuntu:focal
* ubuntu:focal
* Dockerfile.test
* trunk/Dockerfile.test
* [ossrs/srs:dev-gcc7-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7-cache)
* [ossrs/srs:dev-gcc7](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7)
* centos:7
* Dockerfile.cov
* trunk/Dockerfile.cov
* [ossrs/srs:dev-gcc7-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7-cache)
* [ossrs/srs:dev-gcc7](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7)
* centos:7
* Dockerfile.pkg
* trunk/Dockerfile.pkg
* [ossrs/srs:dev](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev)
* centos:7
* Dockerfile.builds
* trunk/Dockerfile.builds
* [ossrs/srs:dev-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-cache)
* [ossrs/srs:dev](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev)
* centos:7