Skip to content

Commit a36d746

Browse files
guillaumevillemontguillaumevillemont
committed
Merge tag 'tags/stable-10078-1' into openshift
2 parents 24f63ef + 6ab6f1e commit a36d746

File tree

17 files changed

+416
-77
lines changed

17 files changed

+416
-77
lines changed

‎.github/workflows/ci.yml

+24-12
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,26 @@ jobs:
2525
"arm64") TPL_ARCH=arm64; S6_ARCH=aarch64 ;; \
2626
*) echo "unsupported architecture"; exit 1 ;; \
2727
esac
28-
wget -qO /tmp/tpl https://github.com/jitsi/tpl/releases/download/v1.4.0/tpl-linux-${TPL_ARCH}
28+
wget -qO /tmp/tpl https://github.com/jitsi/tpl/releases/latest/download/tpl-linux-${TPL_ARCH}
2929
chmod +x /tmp/tpl
30+
- name: setup duktape
31+
working-directory: /tmp
32+
run: |
33+
wget https://duktape.org/duktape-2.2.1.tar.xz
34+
tar xvf duktape-2.2.1.tar.xz
35+
cd duktape-2.2.1
36+
make -f Makefile.cmdline
37+
mv duk /usr/local/bin
3038
- name: Run tpl with default values for web
39+
env:
40+
P2P_STUN_SERVERS: stun.l.google.com:19302,stun1.l.google.com:19302,stun2.l.google.com:19302
3141
run: |
3242
/tmp/tpl web/rootfs/defaults/system-config.js > /tmp/config.js
3343
/tmp/tpl web/rootfs/defaults/settings-config.js >> /tmp/config.js
44+
echo "console.log(JSON.stringify(config, undefined, 2));" >> /tmp/config.js
45+
cat /tmp/config.js
3446
- name: Check config.js syntax
35-
run: node /tmp/config.js
47+
run: duk /tmp/config.js
3648
- name: Run tpl with default values for jvb
3749
run: |
3850
/tmp/tpl jvb/rootfs/defaults/jvb.conf > /tmp/jvb.conf
@@ -69,14 +81,14 @@ jobs:
6981
runs-on: ubuntu-latest
7082
steps:
7183
- name: Check out code
72-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
7385
- name: Setup Docker Buildx
74-
uses: docker/setup-buildx-action@v2
86+
uses: docker/setup-buildx-action@v3
7587
with:
7688
driver: docker
7789

7890
- name: Build base
79-
uses: docker/build-push-action@v2
91+
uses: docker/build-push-action@v6
8092
with:
8193
context: ./base
8294
load: true
@@ -86,55 +98,55 @@ jobs:
8698
JITSI_RELEASE=unstable
8799
88100
- name: Build base-java
89-
uses: docker/build-push-action@v2
101+
uses: docker/build-push-action@v6
90102
with:
91103
context: ./base-java
92104
load: true
93105
tags: |
94106
jitsi/base-java:latest
95107
96108
- name: Build jibri
97-
uses: docker/build-push-action@v2
109+
uses: docker/build-push-action@v6
98110
with:
99111
context: ./jibri
100112
load: true
101113
tags: |
102114
jitsi/jibri:latest
103115
104116
- name: Build jicofo
105-
uses: docker/build-push-action@v2
117+
uses: docker/build-push-action@v6
106118
with:
107119
context: ./jicofo
108120
load: true
109121
tags: |
110122
jitsi/jicofo:latest
111123
112124
- name: Build jigasi
113-
uses: docker/build-push-action@v2
125+
uses: docker/build-push-action@v6
114126
with:
115127
context: ./jigasi
116128
load: true
117129
tags: |
118130
jitsi/jigasi:latest
119131
120132
- name: Build jvb
121-
uses: docker/build-push-action@v2
133+
uses: docker/build-push-action@v6
122134
with:
123135
context: ./jvb
124136
load: true
125137
tags: |
126138
jitsi/jvb:latest
127139
128140
- name: Build prosody
129-
uses: docker/build-push-action@v2
141+
uses: docker/build-push-action@v6
130142
with:
131143
context: ./prosody
132144
load: true
133145
tags: |
134146
jitsi/prosody:latest
135147
136148
- name: Build web
137-
uses: docker/build-push-action@v2
149+
uses: docker/build-push-action@v6
138150
with:
139151
context: ./web
140152
load: true

‎.github/workflows/release-stable.yml

+288
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,288 @@
1+
name: "Release Stable"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: Version number
8+
required: true
9+
type: string
10+
jobs:
11+
gh-release:
12+
runs-on: ubuntu-latest
13+
needs: [base, base-java, jibri, jicofo, jigasi, jvb, prosody, web]
14+
permissions:
15+
# Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
16+
contents: write
17+
steps:
18+
- uses: actions/checkout@v4
19+
- run: |
20+
sed -i".bak" -e "s/unstable/stable-${{ github.event.inputs.version }}/" *.yml
21+
- uses: stefanzweifel/git-auto-commit-action@v5
22+
with:
23+
commit_message: "release: stable-${{ github.event.inputs.version }}"
24+
- name: release
25+
uses: softprops/action-gh-release@v2
26+
with:
27+
tag_name: stable-${{ github.event.inputs.version }}
28+
generate_release_notes: true
29+
make_latest: true
30+
- run: |
31+
sed -i".bak" -e "s/stable-${{ github.event.inputs.version }}/unstable/" *.yml
32+
- uses: stefanzweifel/git-auto-commit-action@v5
33+
with:
34+
commit_message: "misc: working on unstable"
35+
36+
base:
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Check out code
40+
uses: actions/checkout@v4
41+
- name: Set up QEMU
42+
uses: docker/setup-qemu-action@v3
43+
with:
44+
platforms: linux/amd64,linux/arm64
45+
- name: Setup Docker Buildx
46+
uses: docker/setup-buildx-action@v3
47+
- name: Login to DockerHub
48+
uses: docker/login-action@v3
49+
with:
50+
username: ${{ secrets.DOCKERHUB_USERNAME }}
51+
password: ${{ secrets.DOCKERHUB_TOKEN }}
52+
- name: Build and push
53+
uses: docker/build-push-action@v6
54+
with:
55+
push: true
56+
context: ./base
57+
tags: |
58+
${{ secrets.JITSI_REPO }}/base:stable-${{ github.event.inputs.version }}
59+
${{ secrets.JITSI_REPO }}/base:stable
60+
build-args: |
61+
JITSI_RELEASE=stable
62+
platforms: linux/amd64,linux/arm64
63+
cache-from: type=gha
64+
cache-to: type=gha,mode=max
65+
66+
base-java:
67+
runs-on: ubuntu-latest
68+
needs: base
69+
steps:
70+
- name: Check out code
71+
uses: actions/checkout@v4
72+
- name: Set up QEMU
73+
uses: docker/setup-qemu-action@v3
74+
with:
75+
platforms: linux/amd64,linux/arm64
76+
- name: Setup Docker Buildx
77+
uses: docker/setup-buildx-action@v3
78+
- name: Login to DockerHub
79+
uses: docker/login-action@v3
80+
with:
81+
username: ${{ secrets.DOCKERHUB_USERNAME }}
82+
password: ${{ secrets.DOCKERHUB_TOKEN }}
83+
- name: Build and push
84+
uses: docker/build-push-action@v6
85+
with:
86+
push: true
87+
context: ./base-java
88+
tags: |
89+
${{ secrets.JITSI_REPO }}/base-java:stable-${{ github.event.inputs.version }}
90+
${{ secrets.JITSI_REPO }}/base-java:stable
91+
build-args: |
92+
JITSI_REPO=${{ secrets.JITSI_REPO }}
93+
BASE_TAG=stable-${{ github.event.inputs.version }}
94+
platforms: linux/amd64,linux/arm64
95+
cache-from: type=gha
96+
cache-to: type=gha,mode=max
97+
98+
jibri:
99+
runs-on: ubuntu-latest
100+
needs: base-java
101+
steps:
102+
- name: Check out code
103+
uses: actions/checkout@v4
104+
- name: Set up QEMU
105+
uses: docker/setup-qemu-action@v3
106+
with:
107+
platforms: linux/amd64,linux/arm64
108+
- name: Setup Docker Buildx
109+
uses: docker/setup-buildx-action@v3
110+
- name: Login to DockerHub
111+
uses: docker/login-action@v3
112+
with:
113+
username: ${{ secrets.DOCKERHUB_USERNAME }}
114+
password: ${{ secrets.DOCKERHUB_TOKEN }}
115+
- name: Build and push
116+
uses: docker/build-push-action@v6
117+
with:
118+
push: true
119+
context: ./jibri
120+
tags: |
121+
${{ secrets.JITSI_REPO }}/jibri:stable-${{ github.event.inputs.version }}
122+
${{ secrets.JITSI_REPO }}/jibri:stable
123+
build-args: |
124+
JITSI_REPO=${{ secrets.JITSI_REPO }}
125+
BASE_TAG=stable-${{ github.event.inputs.version }}
126+
platforms: linux/amd64,linux/arm64
127+
cache-from: type=gha
128+
cache-to: type=gha,mode=max
129+
130+
jicofo:
131+
runs-on: ubuntu-latest
132+
needs: base-java
133+
steps:
134+
- name: Check out code
135+
uses: actions/checkout@v4
136+
- name: Set up QEMU
137+
uses: docker/setup-qemu-action@v3
138+
with:
139+
platforms: linux/amd64,linux/arm64
140+
- name: Setup Docker Buildx
141+
uses: docker/setup-buildx-action@v3
142+
- name: Login to DockerHub
143+
uses: docker/login-action@v3
144+
with:
145+
username: ${{ secrets.DOCKERHUB_USERNAME }}
146+
password: ${{ secrets.DOCKERHUB_TOKEN }}
147+
- name: Build and push
148+
uses: docker/build-push-action@v6
149+
with:
150+
push: true
151+
context: ./jicofo
152+
tags: |
153+
${{ secrets.JITSI_REPO }}/jicofo:stable-${{ github.event.inputs.version }}
154+
${{ secrets.JITSI_REPO }}/jicofo:stable
155+
build-args: |
156+
JITSI_REPO=${{ secrets.JITSI_REPO }}
157+
BASE_TAG=stable-${{ github.event.inputs.version }}
158+
platforms: linux/amd64,linux/arm64
159+
cache-from: type=gha
160+
cache-to: type=gha,mode=max
161+
162+
jigasi:
163+
runs-on: ubuntu-latest
164+
needs: base-java
165+
steps:
166+
- name: Check out code
167+
uses: actions/checkout@v4
168+
- name: Set up QEMU
169+
uses: docker/setup-qemu-action@v3
170+
with:
171+
platforms: linux/amd64,linux/arm64
172+
- name: Setup Docker Buildx
173+
uses: docker/setup-buildx-action@v3
174+
- name: Login to DockerHub
175+
uses: docker/login-action@v3
176+
with:
177+
username: ${{ secrets.DOCKERHUB_USERNAME }}
178+
password: ${{ secrets.DOCKERHUB_TOKEN }}
179+
- name: Build and push
180+
uses: docker/build-push-action@v6
181+
with:
182+
push: true
183+
context: ./jigasi
184+
tags: |
185+
${{ secrets.JITSI_REPO }}/jigasi:stable-${{ github.event.inputs.version }}
186+
${{ secrets.JITSI_REPO }}/jigasi:stable
187+
build-args: |
188+
JITSI_REPO=${{ secrets.JITSI_REPO }}
189+
BASE_TAG=stable-${{ github.event.inputs.version }}
190+
platforms: linux/amd64,linux/arm64
191+
cache-from: type=gha
192+
cache-to: type=gha,mode=max
193+
194+
jvb:
195+
runs-on: ubuntu-latest
196+
needs: base-java
197+
steps:
198+
- name: Check out code
199+
uses: actions/checkout@v4
200+
- name: Set up QEMU
201+
uses: docker/setup-qemu-action@v3
202+
with:
203+
platforms: linux/amd64,linux/arm64
204+
- name: Setup Docker Buildx
205+
uses: docker/setup-buildx-action@v3
206+
- name: Login to DockerHub
207+
uses: docker/login-action@v3
208+
with:
209+
username: ${{ secrets.DOCKERHUB_USERNAME }}
210+
password: ${{ secrets.DOCKERHUB_TOKEN }}
211+
- name: Build and push
212+
uses: docker/build-push-action@v6
213+
with:
214+
push: true
215+
context: ./jvb
216+
tags: |
217+
${{ secrets.JITSI_REPO }}/jvb:stable-${{ github.event.inputs.version }}
218+
${{ secrets.JITSI_REPO }}/jvb:stable
219+
build-args: |
220+
JITSI_REPO=${{ secrets.JITSI_REPO }}
221+
BASE_TAG=stable-${{ github.event.inputs.version }}
222+
platforms: linux/amd64,linux/arm64
223+
cache-from: type=gha
224+
cache-to: type=gha,mode=max
225+
226+
prosody:
227+
runs-on: ubuntu-latest
228+
needs: base
229+
steps:
230+
- name: Check out code
231+
uses: actions/checkout@v4
232+
- name: Set up QEMU
233+
uses: docker/setup-qemu-action@v3
234+
with:
235+
platforms: linux/amd64,linux/arm64
236+
- name: Setup Docker Buildx
237+
uses: docker/setup-buildx-action@v3
238+
- name: Login to DockerHub
239+
uses: docker/login-action@v3
240+
with:
241+
username: ${{ secrets.DOCKERHUB_USERNAME }}
242+
password: ${{ secrets.DOCKERHUB_TOKEN }}
243+
- name: Build and push
244+
uses: docker/build-push-action@v6
245+
with:
246+
push: true
247+
context: ./prosody
248+
tags: |
249+
${{ secrets.JITSI_REPO }}/prosody:stable-${{ github.event.inputs.version }}
250+
${{ secrets.JITSI_REPO }}/prosody:stable
251+
build-args: |
252+
JITSI_REPO=${{ secrets.JITSI_REPO }}
253+
BASE_TAG=stable-${{ github.event.inputs.version }}
254+
platforms: linux/amd64,linux/arm64
255+
cache-from: type=gha
256+
cache-to: type=gha,mode=max
257+
258+
web:
259+
runs-on: ubuntu-latest
260+
needs: base
261+
steps:
262+
- name: Check out code
263+
uses: actions/checkout@v4
264+
- name: Set up QEMU
265+
uses: docker/setup-qemu-action@v3
266+
with:
267+
platforms: linux/amd64,linux/arm64
268+
- name: Setup Docker Buildx
269+
uses: docker/setup-buildx-action@v3
270+
- name: Login to DockerHub
271+
uses: docker/login-action@v3
272+
with:
273+
username: ${{ secrets.DOCKERHUB_USERNAME }}
274+
password: ${{ secrets.DOCKERHUB_TOKEN }}
275+
- name: Build and push
276+
uses: docker/build-push-action@v6
277+
with:
278+
push: true
279+
context: ./web
280+
tags: |
281+
${{ secrets.JITSI_REPO }}/web:stable-${{ github.event.inputs.version }}
282+
${{ secrets.JITSI_REPO }}/web:stable
283+
build-args: |
284+
JITSI_REPO=${{ secrets.JITSI_REPO }}
285+
BASE_TAG=stable-${{ github.event.inputs.version }}
286+
platforms: linux/amd64,linux/arm64
287+
cache-from: type=gha
288+
cache-to: type=gha,mode=max

0 commit comments

Comments
 (0)