Skip to content

Commit 6c36447

Browse files
committed
Drop FRONTEND_HOST
This was used in the backend IP access rules, but those have been removed.
1 parent 84076cf commit 6c36447

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

Dockerfile.backend

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ COPY docker-files/backend/BSConfig.pm.in /usr/lib/obs/server/
5858
COPY docker-files/backend/entrypoint.sh /
5959

6060
ENV SRCSERVER_HOST=localhost \
61-
REPSERVER_HOST=localhost \
62-
FRONTEND_HOST=localhost
61+
REPSERVER_HOST=localhost
6362

6463
ENTRYPOINT ["/entrypoint.sh"]
6564

docker-compose.yml

-7
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ services:
187187
command:
188188
- /usr/lib/obs/server/bs_dispatch
189189
environment:
190-
FRONTEND_HOST: web
191190
SRCSERVER_HOST: srcserver
192191
REPSERVER_HOST: repserver
193192
volumes:
@@ -201,7 +200,6 @@ services:
201200
command:
202201
- /usr/lib/obs/server/bs_dodup
203202
environment:
204-
FRONTEND_HOST: web
205203
SRCSERVER_HOST: srcserver
206204
REPSERVER_HOST: repserver
207205
volumes:
@@ -215,7 +213,6 @@ services:
215213
command:
216214
- /usr/lib/obs/server/bs_publish
217215
environment:
218-
FRONTEND_HOST: web
219216
SRCSERVER_HOST: srcserver
220217
REPSERVER_HOST: repserver
221218
volumes:
@@ -231,7 +228,6 @@ services:
231228
command:
232229
- /usr/lib/obs/server/bs_repserver
233230
environment:
234-
FRONTEND_HOST: web
235231
SRCSERVER_HOST: srcserver
236232
REPSERVER_HOST: repserver
237233
volumes:
@@ -246,7 +242,6 @@ services:
246242
- /usr/lib/obs/server/bs_sched
247243
- x86_64
248244
environment:
249-
FRONTEND_HOST: web
250245
SRCSERVER_HOST: srcserver
251246
REPSERVER_HOST: repserver
252247
volumes:
@@ -264,7 +259,6 @@ services:
264259
command:
265260
- /usr/lib/obs/server/bs_srcserver
266261
environment:
267-
FRONTEND_HOST: web
268262
SRCSERVER_HOST: srcserver
269263
REPSERVER_HOST: repserver
270264
volumes:
@@ -278,7 +272,6 @@ services:
278272
command:
279273
- /usr/lib/obs/server/bs_warden
280274
environment:
281-
FRONTEND_HOST: web
282275
SRCSERVER_HOST: srcserver
283276
REPSERVER_HOST: repserver
284277
volumes:

docker-files/backend/entrypoint.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
set -e
44

5-
sed -e "s,@FRONTEND_HOST@,${FRONTEND_HOST},g" \
6-
-e "s,@SRCSERVER_HOST@,${SRCSERVER_HOST},g" \
5+
sed -e "s,@SRCSERVER_HOST@,${SRCSERVER_HOST},g" \
76
-e "s,@REPSERVER_HOST@,${REPSERVER_HOST},g" \
87
/usr/lib/obs/server/BSConfig.pm.in > /usr/lib/obs/server/BSConfig.pm
98

0 commit comments

Comments
 (0)