Skip to content

Commit 520d511

Browse files
AntoLCAntoLC
committed
🔧(project) replace webrtc by yProvider
Replace webrtc by yProvider the project (docker, helm chart, etc).
1 parent 9c512fa commit 520d511

File tree

18 files changed

+138
-137
lines changed

18 files changed

+138
-137
lines changed

‎.github/workflows/docker-hub.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
tags: ${{ steps.meta.outputs.tags }}
105105
labels: ${{ steps.meta.outputs.labels }}
106106

107-
build-and-push-y-webrtc-signaling:
107+
build-and-push-y-provider:
108108
runs-on: ubuntu-latest
109109
steps:
110110
-
@@ -132,7 +132,7 @@ jobs:
132132
id: meta
133133
uses: docker/metadata-action@v5
134134
with:
135-
images: lasuite/impress-y-webrtc-signaling
135+
images: lasuite/impress-y-provider
136136
-
137137
name: Login to DockerHub
138138
if: github.event_name != 'pull_request'
@@ -143,7 +143,7 @@ jobs:
143143
with:
144144
context: .
145145
file: ./src/frontend/Dockerfile
146-
target: y-webrtc-signaling
146+
target: y-provider
147147
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
148148
push: ${{ github.event_name != 'pull_request' }}
149149
tags: ${{ steps.meta.outputs.tags }}

‎.github/workflows/impress-frontend.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
with:
140140
targets: |
141141
app-dev
142-
y-webrtc-signaling
142+
y-provider
143143
load: true
144144
set: |
145145
*.cache-from=type=gha,scope=cached-stage
@@ -213,7 +213,7 @@ jobs:
213213
with:
214214
targets: |
215215
app-dev
216-
y-webrtc-signaling
216+
y-provider
217217
load: true
218218
set: |
219219
*.cache-from=type=gha,scope=cached-stage

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to
2424
## Fixed
2525

2626
- 🐛 Fix emoticon in pdf export #225
27+
- 🐛 Fix collaboration on document #226
2728

2829
## Removed
2930

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ logs: ## display app-dev logs (follow mode)
104104

105105
run: ## start the wsgi (production) and development server
106106
@$(COMPOSE) up --force-recreate -d celery-dev
107-
@$(COMPOSE) up --force-recreate -d y-webrtc-signaling
107+
@$(COMPOSE) up --force-recreate -d y-provider
108108
@echo "Wait for postgresql to be up..."
109109
@$(WAIT_DB)
110110
.PHONY: run
@@ -319,7 +319,7 @@ bump-packages-version: ## bump the version of the project - VERSION_TYPE can be
319319
cd ./src/frontend/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
320320
cd ./src/frontend/apps/e2e/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
321321
cd ./src/frontend/apps/impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
322-
cd ./src/frontend/apps/y-webrtc-signaling/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
322+
cd ./src/frontend/servers/y-provider/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
323323
cd ./src/frontend/packages/eslint-config-impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
324324
cd ./src/frontend/packages/i18n/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
325325
.PHONY: bump-packages-version

‎bin/Tiltfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ docker_build(
1818
)
1919

2020
docker_build(
21-
'localhost:5001/impress-y-webrtc-signaling:latest',
21+
'localhost:5001/impress-y-provider:latest',
2222
context='..',
2323
dockerfile='../src/frontend/Dockerfile',
2424
only=['./src/frontend/', './docker/', './.dockerignore'],
25-
target = 'y-webrtc-signaling',
25+
target = 'y-provider',
2626
live_update=[
27-
sync('../src/frontend/apps/y-webrtc-signaling/src', '/home/frontend/apps/y-webrtc-signaling/src'),
27+
sync('../src/frontend/servers/y-provider/src', '/home/frontend/servers/y-provider/src'),
2828
]
2929
)
3030

‎docker-compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,19 @@ services:
141141
volumes:
142142
- ".:/app"
143143

144-
y-webrtc-signaling:
144+
y-provider:
145145
user: ${DOCKER_USER:-1000}
146146
build:
147147
context: .
148148
dockerfile: ./src/frontend/Dockerfile
149-
target: y-webrtc-signaling
149+
target: y-provider
150150
restart: unless-stopped
151151
ports:
152152
- "4444:4444"
153153
volumes:
154-
- ./src/frontend/apps/y-webrtc-signaling:/home/frontend/apps/y-webrtc-signaling
155-
- /home/frontend/apps/y-webrtc-signaling/node_modules/
156-
- /home/frontend/apps/y-webrtc-signaling/dist/
154+
- ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider
155+
- /home/frontend/servers/y-provider/node_modules/
156+
- /home/frontend/servers/y-provider/dist/
157157

158158
frontend-dev:
159159
user: "${DOCKER_USER:-1000}"
@@ -167,7 +167,7 @@ services:
167167
- ./src/frontend/apps/impress:/home/frontend/apps/impress
168168
- /home/frontend/node_modules/
169169
depends_on:
170-
- y-webrtc-signaling
170+
- y-provider
171171
- celery-dev
172172

173173
kc_postgresql:

‎docs/release.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Whenever we are cooking a new release (e.g. `4.18.1`) we should follow a standar
2323
pullPolicy: Always
2424
tag: "v4.18.1"
2525

26-
webrtc:
26+
y-provider:
2727
image:
28-
repository: lasuite/impress-y-webrtc-signaling
28+
repository: lasuite/impress-y-provider
2929
pullPolicy: Always
3030
tag: "v4.18.1"
3131
```

‎src/frontend/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM node:20-alpine as frontend-deps-y-webrtc-signaling
1+
FROM node:20-alpine as frontend-deps-y-provider
22

33
WORKDIR /home/frontend/
44

55
COPY ./src/frontend/package.json ./package.json
66
COPY ./src/frontend/yarn.lock ./yarn.lock
7-
COPY ./src/frontend/apps/y-webrtc-signaling/package.json ./apps/y-webrtc-signaling/package.json
7+
COPY ./src/frontend/servers/y-provider/package.json ./servers/y-provider/package.json
88
COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslint-config-impress/package.json
99

1010
RUN yarn install
@@ -14,10 +14,10 @@ COPY ./src/frontend/ .
1414
# Copy entrypoint
1515
COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
1616

17-
# ---- y-webrtc-signaling ----
18-
FROM frontend-deps-y-webrtc-signaling as y-webrtc-signaling
17+
# ---- y-provider ----
18+
FROM frontend-deps-y-provider as y-provider
1919

20-
WORKDIR /home/frontend/apps/y-webrtc-signaling
20+
WORKDIR /home/frontend/servers/y-provider
2121
RUN yarn build
2222

2323
# Un-privileged user running the application
@@ -64,8 +64,8 @@ WORKDIR /home/frontend/apps/impress
6464
ARG FRONTEND_THEME
6565
ENV NEXT_PUBLIC_THEME=${FRONTEND_THEME}
6666

67-
ARG SIGNALING_URL
68-
ENV NEXT_PUBLIC_SIGNALING_URL=${SIGNALING_URL}
67+
ARG Y_PROVIDER_URL
68+
ENV NEXT_PUBLIC_Y_PROVIDER_URL=${Y_PROVIDER_URL}
6969

7070
ARG API_ORIGIN
7171
ENV NEXT_PUBLIC_API_ORIGIN=${API_ORIGIN}

‎src/helm/env.d/dev/values.impress.yaml.gotmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ frontend:
8484
pullPolicy: Always
8585
tag: "latest"
8686

87-
webrtc:
87+
yProvider:
8888
replicas: 1
8989

9090
image:
91-
repository: localhost:5001/impress-y-webrtc-signaling
91+
repository: localhost:5001/impress-y-provider
9292
pullPolicy: Always
9393
tag: "latest"
9494

‎src/helm/env.d/preprod/values.impress.yaml.gotmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ frontend:
126126
pullPolicy: Always
127127
tag: "v1.2.1"
128128

129-
webrtc:
129+
yProvider:
130130
image:
131-
repository: lasuite/impress-y-webrtc-signaling
131+
repository: lasuite/impress-y-provider
132132
pullPolicy: Always
133133
tag: "v1.2.1"
134134

0 commit comments

Comments
 (0)