Skip to content

Commit

Permalink
Drop FRONTEND_HOST
Browse files Browse the repository at this point in the history
This was used in the backend IP access rules, but those have been
removed.
  • Loading branch information
dbnicholson committed Nov 27, 2024
1 parent 84076cf commit 6c36447
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
3 changes: 1 addition & 2 deletions Dockerfile.backend
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ COPY docker-files/backend/BSConfig.pm.in /usr/lib/obs/server/
COPY docker-files/backend/entrypoint.sh /

ENV SRCSERVER_HOST=localhost \
REPSERVER_HOST=localhost \
FRONTEND_HOST=localhost
REPSERVER_HOST=localhost

ENTRYPOINT ["/entrypoint.sh"]

Expand Down
7 changes: 0 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ services:
command:
- /usr/lib/obs/server/bs_dispatch
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -201,7 +200,6 @@ services:
command:
- /usr/lib/obs/server/bs_dodup
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -215,7 +213,6 @@ services:
command:
- /usr/lib/obs/server/bs_publish
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -231,7 +228,6 @@ services:
command:
- /usr/lib/obs/server/bs_repserver
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -246,7 +242,6 @@ services:
- /usr/lib/obs/server/bs_sched
- x86_64
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -264,7 +259,6 @@ services:
command:
- /usr/lib/obs/server/bs_srcserver
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand All @@ -278,7 +272,6 @@ services:
command:
- /usr/lib/obs/server/bs_warden
environment:
FRONTEND_HOST: web
SRCSERVER_HOST: srcserver
REPSERVER_HOST: repserver
volumes:
Expand Down
3 changes: 1 addition & 2 deletions docker-files/backend/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

set -e

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

Expand Down

0 comments on commit 6c36447

Please sign in to comment.