diff --git a/.github/docker/entrypoint.sh b/.github/docker/entrypoint.sh index c9934335e..e42cf9d21 100644 --- a/.github/docker/entrypoint.sh +++ b/.github/docker/entrypoint.sh @@ -58,8 +58,8 @@ echo "Checking database status." until nc -z -v -w30 $DB_HOST 3306 do echo "Waiting for database connection..." - # wait for 5 seconds before check again - sleep 5 + # wait for 1 seconds before check again + sleep 1 done ## make sure the db is set up diff --git a/Dockerfile b/Dockerfile index c2d538bef..02da51054 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,7 @@ RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar un RUN rm /usr/local/etc/php-fpm.d/www.conf.default \ && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \ && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \ - && mkdir -p /var/run/php /var/run/nginx \ - && apk del --no-cache libpng-dev libxml2-dev libzip-dev + && mkdir -p /var/run/php /var/run/nginx COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf COPY .github/docker/www.conf /usr/local/etc/php-fpm.d/www.conf diff --git a/docker-compose.example.yml b/docker-compose.example.yml index bd5e509c9..036bceb9a 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -34,8 +34,9 @@ x-common: # services: database: - image: mariadb:10.4 + image: library/mysql:8.0 restart: always + command: --default-authentication-plugin=mysql_native_password volumes: - "/srv/pterodactyl/database:/var/lib/mysql" environment: