Merge pull request #20 from hornygeek/update-ubuntu&php

Update to Ubuntu 20.04 & PHP 7.4
This commit is contained in:
Jeroen Geusebroek 2020-08-17 08:12:38 +02:00 committed by GitHub
commit e371bc65ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,10 @@
FROM ubuntu:18.04
MAINTAINER Jeroen Geusebroek <me@jeroengeusebroek.nl>
FROM ubuntu:20.04
LABEL Author="Jeroen Geusebroek <me@jeroengeusebroek.nl>"
ENV DEBIAN_FRONTEND="noninteractive" \
TERM="xterm" \
APTLIST="apache2 php7.2 php7.2-curl php7.2-gd php7.2-gmp php7.2-mysql php7.2-pgsql php7.2-xml php7.2-xmlrpc php7.2-mbstring php7.2-zip git-core cron wget jq" \
REFRESHED_AT='2020-03-06'
APTLIST="apache2 php7.4 php7.4-curl php7.4-gd php7.4-gmp php7.4-mysql php7.4-pgsql php7.4-xml php7.4-xmlrpc php7.4-mbstring php7.4-zip git-core cron wget jq" \
REFRESHED_AT='2020-08-15'
RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup &&\
echo "Acquire::http {No-Cache=True;};" > /etc/apt/apt.conf.d/no-cache && \
@ -19,8 +19,8 @@ RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup &&\
rm -r /var/www/html && \
rm -rf /tmp/*
RUN git clone -b master --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \
rm -rf /var/www/spotweb/.git && \
RUN git clone -b master --depth 1 --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \
# rm -rf /var/www/spotweb/.git && \
chmod -R 775 /var/www/spotweb && \
chown -R www-data:www-data /var/www/spotweb