forked from coop-cloud/nextcloud
let app container wait for db init
This commit is contained in:
parent
2be42d0a84
commit
0aabef8f7b
4
abra.sh
4
abra.sh
|
@ -1,7 +1,7 @@
|
||||||
export FPM_TUNE_VERSION=v4
|
export FPM_TUNE_VERSION=v4
|
||||||
export NGINX_CONF_VERSION=v3
|
export NGINX_CONF_VERSION=v4
|
||||||
export MY_CNF_VERSION=v4
|
export MY_CNF_VERSION=v4
|
||||||
export ENTRYPOINT_VERSION=v1
|
export ENTRYPOINT_VERSION=v2
|
||||||
|
|
||||||
NC_APP_DIR="app:/var/www/html"
|
NC_APP_DIR="app:/var/www/html"
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
entrypoint: "sh -c 'sleep 10 && /entrypoint.sh php-fpm'" # tries to mitigate this error with postgres https://github.com/nextcloud/docker/issues/1204
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST=db
|
- POSTGRES_HOST=db
|
||||||
- POSTGRES_DB=nextcloud
|
- POSTGRES_DB=nextcloud
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "Giving the db container some time to come up"; sleep 20
|
||||||
|
# see this issue with postgres db https://github.com/nextcloud/docker/issues/1204
|
||||||
|
|
||||||
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
||||||
if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Http/ContentSecurityPolicy.php) ]]; then
|
if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Http/ContentSecurityPolicy.php) ]]; then
|
||||||
sed -i "91 a\\\t\t'{{ env "X_FRAME_OPTIONS_ALLOW_FROM" }}', " lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
sed -i "91 a\\\t\t'{{ env "X_FRAME_OPTIONS_ALLOW_FROM" }}', " lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
||||||
|
|
Loading…
Reference in New Issue