diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index d6a364a5..7485a3f4 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -1,7 +1,7 @@ -FROM php:7.3-apache-buster +FROM php:7.4-apache-buster -ARG COMPOSER_VERSION="1.8.5" -ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" +ARG COMPOSER_VERSION="1.9.1" +ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111" RUN apt-get update \ && apt-get install -y --no-install-recommends apt-utils \ @@ -13,10 +13,10 @@ RUN apt-get update \ && locale-gen && update-locale \ && docker-php-source extract \ && docker-php-ext-configure gd \ - --enable-freetype \ - --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ - --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ - --with-webp-dir=/usr/lib/x86_64-linux-gnu/ \ + --with-freetype \ + --with-jpeg \ + --with-webp \ + --with-xpm \ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ && pecl install imagick \ && docker-php-ext-enable imagick pcntl imagick gd exif zip curl \ diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 74354bfd..1f246f18 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -70,10 +70,12 @@ Notifications +
{{__('navmenu.publicTimeline')}} + {{__('navmenu.settings')}}