Merge remote-tracking branch 'origin/master' into portal-latest

2022-04-28 13:25:13 +02:00 · 2022-04-28 13:25:13 +02:00 · ade593b341
parent eaab7c57d3 99e8f3847f
commit ade593b341
2 changed files with 2 additions and 1 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -22,6 +22,7 @@ services:
        branch: portal-latest
    container_name: sia
    restart: unless-stopped
+    stop_grace_period: 5m
    logging: *default-logging
    environment:
      - SIA_MODULES=gctwra
--- a/packages/health-check/Dockerfile
+++ b/packages/health-check/Dockerfile
@ -1,6 +1,6 @@
 FROM node:16.14.2-alpine

-RUN apk add --no-cache dnsmasq=2.86-r0
+RUN apk add --no-cache dnsmasq~=2

 WORKDIR /usr/app