Skip to content

Commit 7df3c1d

Browse files
committed
Tweaks
1 parent 8370707 commit 7df3c1d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/docker/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ echo "Checking database status."
5858
until nc -z -v -w30 $DB_HOST 3306
5959
do
6060
echo "Waiting for database connection..."
61-
# wait for 5 seconds before check again
62-
sleep 5
61+
# wait for 1 seconds before check again
62+
sleep 1
6363
done
6464

6565
## make sure the db is set up

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar un
2828
RUN rm /usr/local/etc/php-fpm.d/www.conf.default \
2929
&& echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
3030
&& sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
31-
&& mkdir -p /var/run/php /var/run/nginx \
32-
&& apk del --no-cache libpng-dev libxml2-dev libzip-dev
31+
&& mkdir -p /var/run/php /var/run/nginx
3332

3433
COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf
3534
COPY .github/docker/www.conf /usr/local/etc/php-fpm.d/www.conf

docker-compose.example.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ x-common:
3434
#
3535
services:
3636
database:
37-
image: mariadb:10.4
37+
image: library/mysql:8.0
3838
restart: always
39+
command: --default-authentication-plugin=mysql_native_password
3940
volumes:
4041
- "/srv/pterodactyl/database:/var/lib/mysql"
4142
environment:

0 commit comments

Comments
 (0)