1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-23 01:22:30 +01:00

Merge pull request #3523 from parkervcp/fix_dockerfile

fix ghcr builds
This commit is contained in:
Matthew Penner 2021-08-03 21:37:23 -06:00 committed by GitHub
commit 49c24b9c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,13 +25,13 @@ RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar un
&& rm -rf .env bootstrap/cache/*.php \ && rm -rf .env bootstrap/cache/*.php \
&& chown -R nginx:nginx . && chown -R nginx:nginx .
RUN rm /usr/local/etc/php-fpm.d/www.conf.default \ RUN rm /usr/local/etc/php-fpm.conf \
&& 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
COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf COPY .github/docker/default.conf /etc/nginx/http.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.conf
COPY .github/docker/supervisord.conf /etc/supervisord.conf COPY .github/docker/supervisord.conf /etc/supervisord.conf
EXPOSE 80 443 EXPOSE 80 443