Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions RemoteSettings.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,10 @@ FROM production AS local
ENV GRANIAN_STATIC_PATH_ROUTE=/attachments
ENV GRANIAN_STATIC_PATH_MOUNT=/tmp/attachments

# Install curl for readiness test in docker compose
USER root
RUN /opt/update_and_install_system_packages.sh curl
USER app

# create directories for volume mounts used in browser tests / local development
RUN mkdir -p -m 777 /app/mail && mkdir -p -m 777 /app/slack && mkdir -p -m 777 /tmp/attachments
15 changes: 12 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ services:
- debug-mail:/app/mail
- debug-slack:/app/slack
- attachments:/tmp/attachments
healthcheck:
test: ["CMD", "curl", "-fsS", "http://localhost:8888/v1/__lbheartbeat__"]
interval: 2s
timeout: 5s
retries: 30
start_period: 5s

git-reader:
build:
Expand All @@ -81,7 +87,8 @@ services:
image: remotesettings/browser-tests
profiles: [browser-tests]
depends_on:
- web
web:
condition: service_healthy
environment:
- SERVER=http://web:8888/v1
- MAIL_DIR=/var/debug-mail/
Expand All @@ -103,5 +110,7 @@ services:
volumes:
- ./config/nginx.conf:/etc/nginx/conf.d/default.conf
depends_on:
- web
- git-reader
web:
condition: service_healthy
git-reader:
condition: service_started
Loading