Merge branch 'master' into feature/bash

Dockerfile

@@ -13,37 +13,36 @@ RUN set -ex \
  && apk add \
       ansible \
       curl \
-      git \
       libwebp \
       mariadb-client \
       nginx \
       pcre \
-      php7 \
-      php7-amqp \
-      php7-bcmath \
-      php7-ctype \
-      php7-curl \
-      php7-dom \
-      php7-fpm \
-      php7-gd \
-      php7-gettext \
-      php7-iconv \
-      php7-json \
-      php7-mbstring \
-      php7-openssl \
-      php7-pdo_mysql \
-      php7-pdo_pgsql \
-      php7-pdo_sqlite \
-      php7-phar \
-      php7-session \
-      php7-simplexml \
-      php7-tokenizer \
-      php7-xml \
-      php7-zlib \
-      php7-sockets \
-      php7-xmlreader \
-      php7-tidy \
-      php7-intl \
+      php8 \
+      php8-bcmath \
+      php8-ctype \
+      php8-curl \
+      php8-dom \
+      php8-fpm \
+      php8-gd \
+      php8-gettext \
+      php8-iconv \
+      php8-json \
+      php8-mbstring \
+      php8-openssl \
+      php8-pecl-amqp \
+      php8-pdo_mysql \
+      php8-pdo_pgsql \
+      php8-pdo_sqlite \
+      php8-phar \
+      php8-session \
+      php8-simplexml \
+      php8-tokenizer \
+      php8-xml \
+      php8-zlib \
+      php8-sockets \
+      php8-xmlreader \
+      php8-tidy \
+      php8-intl \
       py3-mysqlclient \
       py3-psycopg2 \
       py-simplejson \
@@ -51,19 +50,27 @@ RUN set -ex \
       s6 \
       tar \
       tzdata \
+ && ln -sf /usr/bin/php8 /usr/bin/php \
+ && ln -sf /usr/sbin/php-fpm8 /usr/sbin/php-fpm \
  && rm -rf /var/cache/apk/* \
  && ln -sf /dev/stdout /var/log/nginx/access.log \
  && ln -sf /dev/stderr /var/log/nginx/error.log \
  && curl -s https://getcomposer.org/installer | php \
  && mv composer.phar /usr/local/bin/composer \
- && composer selfupdate 2.2.12 \
- && git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag
+ && composer selfupdate 2.2.12
 
 COPY root /
 
 RUN set -ex \
+ && mv /var/www/wallabag/app /tmp/app \
+ && curl -L -o /tmp/wallabag.tar.gz https://github.com/wallabag/wallabag/archive/$WALLABAG_VERSION.tar.gz \
+ && tar xvf /tmp/wallabag.tar.gz -C /tmp \
+ && mv /tmp/wallabag-*/* /var/www/wallabag/ \
+ && rm -rf /tmp/wallabag* \
+ && mv /tmp/app/config/parameters.yml /var/www/wallabag/app/config/parameters.yml \
  && cd /var/www/wallabag \
  && SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist --no-progress \
+ && rm -rf /root/.composer/* /var/www/wallabag/var/cache/* /var/www/wallabag/var/logs/* /var/www/wallabag/var/sessions/* \
  && chown -R nobody:nobody /var/www/wallabag
 
 EXPOSE 80