Skip to content

Commit 8b80566

Browse files
xiaozhihongxiaozhihong
committed
Use new cache image name. v5.0.186
1 parent ed0be6c commit 8b80566

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ jobs:
152152
- name: Checkout repository
153153
uses: actions/checkout@v3
154154
- name: Cross Build for ARMv7 on Ubuntu16
155-
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-armv7 .
155+
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 .
156156
- name: Cross Build for ARMv7 on Ubuntu20
157-
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-armv7 .
157+
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 .
158158
runs-on: ubuntu-20.04
159159

160160
build-cross-aarch64:
@@ -165,9 +165,9 @@ jobs:
165165
- name: Checkout repository
166166
uses: actions/checkout@v3
167167
- name: Cross Build for AARCH64 on Ubuntu16
168-
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-aarch64 .
168+
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 .
169169
- name: Cross Build for AARCH64 on Ubuntu20
170-
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-aarch64 .
170+
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 .
171171
runs-on: ubuntu-20.04
172172

173173
test:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Would you like additional assistance from us? By becoming a sponsor or backer of
110110
with the support you need:
111111

112112
* Backer: $5 per month, online text chat support through Discord.
113-
* Sponsor: $100 per month, online meeting support, 1 meeting per month in 1 hour.
113+
* Sponsor: $100 per month, online text chat plus online meeting support.
114114

115115
Please visit [OpenCollective](https://opencollective.com/srs-server) to become a backer or sponsor, and send
116116
us a direct message on [Discord](https://discord.gg/yZ4BnPmHAd). We are currently providing support to the

‎trunk/Dockerfile.builds‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ COPY . /srs
4747
RUN cd /srs/trunk && ./configure --srt=on --gb28181=on --apm=on && make
4848

4949
########################################################
50-
FROM ossrs/srs:ubuntu16-cross-arm AS ubuntu16-cross-armv7
50+
FROM ossrs/srs:ubuntu16-cache-cross-arm AS ubuntu16-cache-cross-armv7
5151
COPY . /srs
5252
RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=arm-linux-gnueabihf- && make
5353

54-
FROM ossrs/srs:ubuntu16-cross-aarch64 AS ubuntu16-cross-aarch64
54+
FROM ossrs/srs:ubuntu16-cache-cross-aarch64 AS ubuntu16-cache-cross-aarch64
5555
COPY . /srs
5656
RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=aarch64-linux-gnu- && make
5757

5858
########################################################
59-
FROM ossrs/srs:ubuntu20-cross-arm AS ubuntu20-cross-armv7
59+
FROM ossrs/srs:ubuntu20-cache-cross-arm AS ubuntu20-cache-cross-armv7
6060
COPY . /srs
6161
RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=arm-linux-gnueabihf- && make
6262

63-
FROM ossrs/srs:ubuntu20-cross-aarch64 AS ubuntu20-cross-aarch64
63+
FROM ossrs/srs:ubuntu20-cache-cross-aarch64 AS ubuntu20-cache-cross-aarch64
6464
COPY . /srs
6565
RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=aarch64-linux-gnu- && make

‎trunk/auto/options.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Toolchain options:
201201
--extra-flags=<EFLAGS> Set EFLAGS as CFLAGS and CXXFLAGS. Also passed to ST as EXTRA_CFLAGS.
202202
203203
Cross Build options: @see https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs
204-
--cross-build Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
204+
--cross=on|off Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
205205
--cpu=<CPU> Toolchain: Select the minimum required CPU for cross-build. For example: --cpu=24kc
206206
--arch=<ARCH> Toolchain: Select architecture for cross-build. For example: --arch=aarch64
207207
--host=<BUILD> Toolchain: Cross-compile to build programs to run on HOST. For example: --host=aarch64-linux-gnu
@@ -230,6 +230,7 @@ Experts:
230230
--generic-linux=on|off Whether run as generic linux, if not CentOS or Ubuntu. Default: $(value2switch $SRS_GENERIC_LINUX)
231231
232232
Deprecated:
233+
--cross-build Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
233234
--hds=on|off Whether build the hds streaming, mux RTMP to F4M/F4V files. Default: $(value2switch $SRS_HDS)
234235
--osx Enable build for OSX/Darwin AppleOS. Deprecated for automatically detecting the OS.
235236
--x86-64 Enable build for __x86_64 systems. Deprecated for automatically detecting the OS.
@@ -410,6 +411,7 @@ function parse_user_option() {
410411
--generic-linux) SRS_GENERIC_LINUX=$(switch2value $value) ;;
411412

412413
# Alias for --arm, cross build.
414+
--cross) SRS_CROSS_BUILD=$(switch2value $value) ;;
413415
--cross-build) SRS_CROSS_BUILD=YES ;;
414416
--enable-cross-compile) SRS_CROSS_BUILD=YES ;;
415417

@@ -592,7 +594,7 @@ function apply_detail_options() {
592594
if [[ $SRS_HLS == NO ]]; then SRS_HLS=YES; echo -e "${YELLOW}[WARN] Always enable HLS.${BLACK}"; fi
593595
if [[ $SRS_DVR == NO ]]; then SRS_DVR=YES; echo -e "${YELLOW}[WARN] Always enable DVR.${BLACK}"; fi
594596

595-
if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER == NO; fi
597+
if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER=NO; fi
596598
}
597599
apply_detail_options
598600

‎trunk/doc/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v5-changes"></a>
88

99
## SRS 5.0 Changelog
10+
* v5.0, 2023-10-08, Merge [#3815](https://github.com/ossrs/srs/pull/3815): Use new cache image name. v5.0.186 (#3815)
1011
* v5.0, 2023-09-28, Merge [#3816](https://github.com/ossrs/srs/pull/3816): cherry-pick from develop, for srt utest. v5.0.185 (#3816)
1112
* v5.0, 2023-09-21, Merge [#3806](https://github.com/ossrs/srs/pull/3806): Build: Support sys-ssl for srt. v5.0.184 (#3806)
1213
* v5.0, 2023-09-21, Merge [#3808](https://github.com/ossrs/srs/pull/3808): Upgrade libsrt to v1.5.3. v5.0.183 (#3808)

‎trunk/doc/Dockers.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ The dependency tree about Dockerfile:
4949
* [ossrs/srs:ubuntu20-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache)
5050
* [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
5151
* ubuntu:focal
52-
* [ossrs/srs:ubuntu16-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-arm)
52+
* [ossrs/srs:ubuntu16-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-arm)
5353
* [ossrs/srs:ubuntu16](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16)
5454
* ubuntu:xenial
55-
* [ossrs/srs:ubuntu16-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-aarch64)
55+
* [ossrs/srs:ubuntu16-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-aarch64)
5656
* [ossrs/srs:ubuntu16](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16)
5757
* ubuntu:xenial
58-
* [ossrs/srs:ubuntu20-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-arm)
58+
* [ossrs/srs:ubuntu20-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-arm)
5959
* [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
6060
* ubuntu:focal
61-
* [ossrs/srs:ubuntu20-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-aarch64)
61+
* [ossrs/srs:ubuntu20-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-aarch64)
6262
* [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
6363
* ubuntu:focal
6464

@@ -73,10 +73,10 @@ If need to reconfigure SRS, please update SRS, then update the images:
7373
* [ossrs/srs:ubuntu16-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache)
7474
* [ossrs/srs:ubuntu18-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu18-cache)
7575
* [ossrs/srs:ubuntu20-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache)
76-
* [ossrs/srs:ubuntu16-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-arm)
77-
* [ossrs/srs:ubuntu16-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-aarch64)
78-
* [ossrs/srs:ubuntu20-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-arm)
79-
* [ossrs/srs:ubuntu20-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-aarch64)
76+
* [ossrs/srs:ubuntu16-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-arm)
77+
* [ossrs/srs:ubuntu16-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-aarch64)
78+
* [ossrs/srs:ubuntu20-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-arm)
79+
* [ossrs/srs:ubuntu20-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-aarch64)
8080

8181
For example, update the [release.yml](https://github.com/ossrs/dev-docker/blob/ubuntu20-cache/.github/workflows/release.yml) for ubuntu20-cache:
8282

‎trunk/src/core/srs_core_version5.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 5
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 185
12+
#define VERSION_REVISION 186
1313

1414
#endif

0 commit comments

Comments
 (0)