Compare commits

..

2 Commits

Author SHA1 Message Date
03eb35d65c
fixup! add entry point for release docker 2023-09-16 22:12:01 +02:00
16f904e17b
fixup! update docker-compose 2023-09-16 22:11:42 +02:00
2 changed files with 7 additions and 2 deletions

View File

@ -6,7 +6,8 @@ services:
dockerfile: docker/Dockerfile dockerfile: docker/Dockerfile
target: mapg_dev target: mapg_dev
depends_on: depends_on:
- mariadb mariadb:
condition: service_healthy
ports: ports:
- 80:80 - 80:80
- 5000:5000 - 5000:5000
@ -26,6 +27,10 @@ services:
MYSQL_DATABASE: 'mapguesser' MYSQL_DATABASE: 'mapguesser'
MYSQL_USER: 'mapguesser' MYSQL_USER: 'mapguesser'
MYSQL_PASSWORD: 'mapguesser' MYSQL_PASSWORD: 'mapguesser'
healthcheck:
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', '$$MYSQL_USER', '-p$$MYSQL_PASSWORD' ]
timeout: 5s
retries: 10
adminer: adminer:
image: adminer:4.8.1-standalone image: adminer:4.8.1-standalone
ports: ports:

View File

@ -10,7 +10,7 @@ echo "Installing crontab..."
set +e set +e
/usr/sbin/cron & /usr/sbin/cron -f &
/usr/sbin/php-fpm7.4 -F & /usr/sbin/php-fpm7.4 -F &
/usr/sbin/nginx -g 'daemon off;' & /usr/sbin/nginx -g 'daemon off;' &
/usr/bin/node multi & /usr/bin/node multi &