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.

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

Simplify nginx-send-usr1 make target #207

Merged
merged 1 commit into from
May 28, 2024
Merged
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
2 changes: 1 addition & 1 deletion deployment/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ include logrotate.make

# Rule to send nginx USR1 signal via docker compose (used by `logrotate.conf`)
nginx-send-usr1:
docker compose exec -T frontend /bin/bash -c 'kill -USR1 `pgrep -f "nginx: [m]aster"`'
docker compose kill --signal=SIGUSR1 frontend

# Rule to send nginx HUP signal to reload configuration
nginx-send-hup:
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
build:
context: .
dockerfile_inline: |
FROM jonasal/nginx-certbot:5.0.1
FROM jonasal/nginx-certbot:5.2.0
RUN groupadd --gid ${GID} nginx-host-uid && \
useradd --gid nginx-host-uid --no-create-home --home /nonexistent --comment "nginx user with host uid" --shell /bin/false --uid ${UID} nginx-host-uid
pull_policy: never
Expand Down
2 changes: 1 addition & 1 deletion loadbalancer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ include ../deployment/logrotate.make

# Rule to send nginx USR1 signal via docker compose (used by `logrotate.conf`)
nginx-send-usr1:
docker compose exec -T loadbalancer /bin/bash -c 'kill -USR1 `pgrep -f "nginx: [m]aster"`'
docker compose kill --signal=SIGUSR1 loadbalancer

# Rule to send nginx HUP signal to reload configuration
nginx-send-hup:
Expand Down
2 changes: 1 addition & 1 deletion loadbalancer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build:
context: .
dockerfile_inline: |
FROM jonasal/nginx-certbot:5.0.1
FROM jonasal/nginx-certbot:5.2.0
RUN groupadd --gid ${GID} nginx-host-uid && \
useradd --gid nginx-host-uid --no-create-home --home /nonexistent --comment "nginx user with host uid" --shell /bin/false --uid ${UID} nginx-host-uid
pull_policy: never
Expand Down
Loading