Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move NGINX-based services out of the API profile #4416

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Move NGINX-based services out of the API profile #4416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b187f25
Move NGINX and proxy out of the API profile
dhruvkb May 31, 2024
57d73f8
Silence Docker pull progress bars in CI logs
dhruvkb May 31, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions api/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ services:
cache:
profiles:
- api
- api_extra
image: docker.io/redis:7.2.4
ports:
- "50263:6379"

web:
profiles:
- api
- api_extra
build:
target: api
additional_contexts:
Expand All @@ -35,7 +37,7 @@ services:

nginx:
profiles:
- api
- api_extra
build:
target: nginx
additional_contexts:
Expand All @@ -53,7 +55,7 @@ services:

proxy:
profiles:
- api
- api_extra
image: docker.io/nginx:alpine
ports:
- "50200:9080"
Expand Down
4 changes: 4 additions & 0 deletions api/justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ install *args:
up *flags:
env COMPOSE_PROFILES="api" just ../up {{ flags }}

# Bring up services specific to the API profile, in addition to the API server
up-extra *flags:
env COMPOSE_PROFILES="api_extra" just ../up {{ flags }}

# Wait for all profile services to be up
wait-up: up
just ../ingestion_server/wait # API profile includes ingestion server
Expand Down
2 changes: 1 addition & 1 deletion justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ up *flags: env && ps
#!/usr/bin/env bash
set -eo pipefail
while true; do
if just dc up -d {{ flags }} ; then
if just dc up {{ if IS_CI != "" { "--quiet-pull" } else { "" } }} -d {{ flags }} ; then
break
fi
((c++)) && ((c==3)) && break
Expand Down