Compare commits
No commits in common. "03eb35d65ccae4640c156de4fd5b74f2c56291a3" and "fb86162009b5bd00cc3cd87a16e535626c70d1a2" have entirely different histories.
03eb35d65c
...
fb86162009
@ -6,8 +6,7 @@ services:
|
||||
dockerfile: docker/Dockerfile
|
||||
target: mapg_dev
|
||||
depends_on:
|
||||
mariadb:
|
||||
condition: service_healthy
|
||||
- mariadb
|
||||
ports:
|
||||
- 80:80
|
||||
- 5000:5000
|
||||
@ -27,10 +26,6 @@ services:
|
||||
MYSQL_DATABASE: 'mapguesser'
|
||||
MYSQL_USER: 'mapguesser'
|
||||
MYSQL_PASSWORD: 'mapguesser'
|
||||
healthcheck:
|
||||
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', '$$MYSQL_USER', '-p$$MYSQL_PASSWORD' ]
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
adminer:
|
||||
image: adminer:4.8.1-standalone
|
||||
ports:
|
||||
|
@ -10,7 +10,7 @@ echo "Installing crontab..."
|
||||
|
||||
set +e
|
||||
|
||||
/usr/sbin/cron -f &
|
||||
/usr/sbin/cron &
|
||||
/usr/sbin/php-fpm7.4 -F &
|
||||
/usr/sbin/nginx -g 'daemon off;' &
|
||||
/usr/bin/node multi &
|
||||
|
Loading…
Reference in New Issue
Block a user