Tweaks
This commit is contained in:
parent
83707079e8
commit
7df3c1d013
3 changed files with 5 additions and 5 deletions
4
.github/docker/entrypoint.sh
vendored
4
.github/docker/entrypoint.sh
vendored
|
@ -58,8 +58,8 @@ echo "Checking database status."
|
||||||
until nc -z -v -w30 $DB_HOST 3306
|
until nc -z -v -w30 $DB_HOST 3306
|
||||||
do
|
do
|
||||||
echo "Waiting for database connection..."
|
echo "Waiting for database connection..."
|
||||||
# wait for 5 seconds before check again
|
# wait for 1 seconds before check again
|
||||||
sleep 5
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
## make sure the db is set up
|
## make sure the db is set up
|
||||||
|
|
|
@ -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 \
|
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 \
|
&& 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 \
|
&& sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
|
||||||
&& mkdir -p /var/run/php /var/run/nginx \
|
&& mkdir -p /var/run/php /var/run/nginx
|
||||||
&& apk del --no-cache libpng-dev libxml2-dev libzip-dev
|
|
||||||
|
|
||||||
COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf
|
COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf
|
||||||
COPY .github/docker/www.conf /usr/local/etc/php-fpm.d/www.conf
|
COPY .github/docker/www.conf /usr/local/etc/php-fpm.d/www.conf
|
||||||
|
|
|
@ -34,8 +34,9 @@ x-common:
|
||||||
#
|
#
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: mariadb:10.4
|
image: library/mysql:8.0
|
||||||
restart: always
|
restart: always
|
||||||
|
command: --default-authentication-plugin=mysql_native_password
|
||||||
volumes:
|
volumes:
|
||||||
- "/srv/pterodactyl/database:/var/lib/mysql"
|
- "/srv/pterodactyl/database:/var/lib/mysql"
|
||||||
environment:
|
environment:
|
||||||
|
|
Loading…
Reference in a new issue