Merge branch 'master' into sevey/add-skylink-health-check

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

packages/health-check/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:16.14.2-alpine
 
-RUN apk add --no-cache dnsmasq=2.86-r1
+RUN apk add --no-cache dnsmasq~=2
 
 WORKDIR /usr/app
 

packages/website/Dockerfile

@@ -34,4 +34,4 @@ COPY --from=builder /usr/app/public /usr/app/public
 
 EXPOSE 9000
 
-CMD ["http-server", "/usr/app/public", "-s -p 9000"]
+CMD ["http-server", "/usr/app/public", "-s", "-p 9000"]