diff --git a/CHANGELOG.md b/CHANGELOG.md index 2320dcdd0..a0fa415ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ This file is a running track of new features and fixes to each version of the pa This project follows [Semantic Versioning](http://semver.org) guidelines. +## v1.5.1 +### Fixed +* Fixes Docker image 404ing instead of being able to access the Panel. +* Fixes Java version feature being only loaded when the `eula` feature is specified. +* Fixes `php artisan p:upgrade` not forcing and seeding while running migrations. +* Fixes spinner overlays overlapping on the server console page. +* Fixes Wings being unable to update backup statuses. + ## v1.5.0 ### Fixed * Fixes deleting a locked backup that has also been marked as failed to allow deletion rather than returning an error about being locked. diff --git a/Dockerfile b/Dockerfile index 02da51054..8d50d3845 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,13 +25,13 @@ RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar un && rm -rf .env bootstrap/cache/*.php \ && 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 \ && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \ && 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 +COPY .github/docker/default.conf /etc/nginx/http.d/default.conf +COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf COPY .github/docker/supervisord.conf /etc/supervisord.conf EXPOSE 80 443