Merge branch 'master' into minimise-root-user
This commit is contained in:
commit
e906e1f39d
@ -33,7 +33,7 @@ services:
|
|||||||
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
|
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
|
||||||
interval: 60s
|
interval: 60s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3s
|
retries: 3
|
||||||
|
|
||||||
datapusher:
|
datapusher:
|
||||||
image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
|
image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
|
||||||
@ -42,7 +42,7 @@ services:
|
|||||||
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
|
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
|
||||||
interval: 60s
|
interval: 60s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3s
|
retries: 3
|
||||||
|
|
||||||
db:
|
db:
|
||||||
build:
|
build:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user