mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Updating Dockerfile according to #3737, #3740, #3850 and #4065

This commit is contained in:
Mehdi Benadel 2023-01-07 22:49:22 +01:00
parent 9ad4141d34
commit 3ec81f9e32
2 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/docker/Dockerfile.apache
View File

@ -1,4 +1,4 @@
FROM php:8.1-apache FROM php:8.1-apache-bullseye
ENV COMPOSER_MEMORY_LIMIT=-1 ENV COMPOSER_MEMORY_LIMIT=-1
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -18,8 +18,8 @@ RUN apt-get update \
git \ git \
gosu \ gosu \
zip \ zip \
unzip \ unzip \
libzip-dev \ libzip-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
## Image Optimization ## Image Optimization
optipng \ optipng \

106
contrib/docker/Dockerfile.fpm
View File

@ -1,29 +1,25 @@
FROM php:7.4-fpm-buster FROM php:8.1-fpm-bullseye
# Use the default production configuration ENV COMPOSER_MEMORY_LIMIT=-1
COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini" ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /var/www/
# Install Composer # Get Composer binary
ENV COMPOSER_VERSION 1.9.2 COPY --from=composer:2.4.4 /usr/bin/composer /usr/bin/composer
ENV COMPOSER_HOME /var/www/.composer
RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
&& curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \
&& php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \
&& php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php
# Update OS Packages # Install package dependencies
RUN apt-get update RUN apt-get update \
&& apt-get upgrade -y \
# Install OS Packages # && apt-get install -y --no-install-recommends apt-utils \
RUN apt-get install -y --no-install-recommends apt-utils && apt-get install -y --no-install-recommends \
RUN apt-get install -y --no-install-recommends \
## Standard ## Standard
locales locales-all \ locales \
locales-all \
git \ git \
gosu \ gosu \
zip \ zip \
unzip \ unzip \
libzip-dev \ libzip-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
## Image Optimization ## Image Optimization
optipng \ optipng \
@ -33,62 +29,62 @@ RUN apt-get install -y --no-install-recommends \
## Image Processing ## Image Processing
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libpng-dev \ libpng-dev \
libmagickwand-dev \
# Required for GD # Required for GD
libxpm4 \ libxpm4 \
libxpm-dev \ libxpm-dev \
libwebp6 \ libwebp6 \
libwebp-dev \ libwebp-dev \
## Video Processing ## Video Processing
ffmpeg ffmpeg \
## Database
# Update Local data # libpq-dev \
RUN sed -i '/en_US/s/^#//g' /etc/locale.gen && locale-gen && update-locale # libsqlite3-dev \
mariadb-client \
# Locales Update
&& sed -i '/en_US/s/^#//g' /etc/locale.gen \
&& locale-gen \
&& update-locale \
# Install PHP extensions # Install PHP extensions
RUN docker-php-source extract && docker-php-source extract \
#PHP Imagemagick extensions #PHP Imagemagick extensions
RUN apt-get install -y --no-install-recommends libmagickwand-dev && pecl install imagick \
RUN pecl install imagick && docker-php-ext-enable imagick \
RUN docker-php-ext-enable imagick
# PHP GD extensions # PHP GD extensions
RUN docker-php-ext-configure gd \ && docker-php-ext-configure gd \
--with-freetype \ --with-freetype \
--with-jpeg \ --with-jpeg \
--with-webp \ --with-webp \
--with-xpm --with-xpm \
RUN docker-php-ext-install -j$(nproc) gd && docker-php-ext-install -j$(nproc) gd \
#PHP Redis extensions #PHP Redis extensions
RUN pecl install redis && pecl install redis \
RUN docker-php-ext-enable redis && docker-php-ext-enable redis \
#PHP Database extensions #PHP Database extensions
RUN apt-get install -y --no-install-recommends libpq-dev libsqlite3-dev && docker-php-ext-install pdo_mysql \
RUN docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite #pdo_pgsql pdo_sqlite \
#PHP extensions (dependencies) #PHP extensions (dependencies)
RUN docker-php-ext-configure intl && docker-php-ext-configure intl \
RUN docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl && docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl \
#Cleanup #Cleanup
RUN docker-php-source delete && docker-php-source delete \
RUN apt-get autoremove --purge -y && apt-get autoremove --purge -y \
RUN rm -rf /var/cache/apt && apt-get clean \
RUN rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt \
&& rm -rf /var/lib/apt/lists/
ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" # Use the default production configuration
COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini"
COPY . /var/www/ COPY . /var/www/
WORKDIR /var/www/ # for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862
RUN cp -r storage storage.skel \
&& composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
&& rm -rf html && ln -s public html \
&& chown -R www-data:www-data /var/www
RUN cp -r storage storage.skel RUN php artisan horizon:publish
RUN composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist
RUN composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader
RUN composer global remove hirak/prestissimo
RUN rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap
CMD ["/var/www/contrib/docker/start.fpm.sh"] CMD ["/var/www/contrib/docker/start.fpm.sh"]