Merge remote-tracking branch 'origin/master' into portal-latest
This commit is contained in:
commit
ade593b341
|
@ -22,6 +22,7 @@ services:
|
||||||
branch: portal-latest
|
branch: portal-latest
|
||||||
container_name: sia
|
container_name: sia
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
stop_grace_period: 5m
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
environment:
|
environment:
|
||||||
- SIA_MODULES=gctwra
|
- SIA_MODULES=gctwra
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM node:16.14.2-alpine
|
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
|
WORKDIR /usr/app
|
||||||
|
|
||||||
|
|
Reference in New Issue