rebuild heimdall, nginx for php7.4, alpine 3.13

This commit is contained in:
t3chn0m4g3 2021-02-15 11:00:00 +00:00
parent 8112f48270
commit 95ea079f4d

View file

@ -1,11 +1,10 @@
FROM alpine:3.12 FROM alpine:3.13
# #
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/
# #
# Get and install dependencies & packages # Get and install dependencies & packages
RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ RUN apk -U --no-cache add \
apk -U --no-cache add \
git \ git \
nginx \ nginx \
nginx-mod-http-headers-more \ nginx-mod-http-headers-more \
@ -29,13 +28,15 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
# Clone and setup Heimdall, Nginx # Clone and setup Heimdall, Nginx
git clone https://github.com/linuxserver/heimdall && \ git clone https://github.com/linuxserver/heimdall && \
cd heimdall && \ cd heimdall && \
git checkout 3a9bdd2c431d70803b259990fa4d81db4b06dba4 && \ git checkout 61a5a1a8b023771e0ff7c056add5537d20737e51 && \
cd .. && \ cd .. && \
cp -R heimdall/. /var/lib/nginx/html && \ cp -R heimdall/. /var/lib/nginx/html && \
rm -rf heimdall && \ rm -rf heimdall && \
cd /var/lib/nginx/html && \ cd /var/lib/nginx/html && \
cp .env.example .env && \ cp .env.example .env && \
php artisan key:generate && \ # Fix error for ArrayInput in smyfony with regard to PHP7.4 (https://github.com/symfony/symfony/pull/32806/files)
sed -i "135s/.*/} elseif (0 === strpos(\$key, '-')) {/" /var/lib/nginx/html/vendor/symfony/console/Input/ArrayInput.php && \
php7 artisan key:generate && \
# #
## Add previously configured content ## Add previously configured content
mkdir -p /var/lib/nginx/html/storage/app/public/backgrounds/ && \ mkdir -p /var/lib/nginx/html/storage/app/public/backgrounds/ && \