mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-09-20 00:08:01 +00:00
8f93390a2e
The Dockerfile.apache has been updated recently, but Dockerfile.fpm not. Due to this, the docker build is failing with the following error: ``` configure: error: unrecognized options: --enable-freetype The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get install -y --no-install-recommends git gosu optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client && sed -i '/en_US/s/^#//g' /etc/locale.gen && 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/ && 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 && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - && chmod 755 /usr/bin/composer && apt-get autoremove --purge -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev && rm -rf /var/cache/apt && docker-php-source delete' returned a non-zero code: 1 ``` This change updates Dockerfile.fpm to equal the Dockerfile.apache variant. (Except the fpm or apache specific settings)
65 lines
2.3 KiB
Docker
65 lines
2.3 KiB
Docker
ARG COMPOSER_VERSION="1.9.1"
|
|
ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends apt-utils \
|
|
&& apt-get install -y --no-install-recommends git gosu \
|
|
optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \
|
|
libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \
|
|
libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\
|
|
&& sed -i '/en_US/s/^#//g' /etc/locale.gen \
|
|
&& locale-gen && update-locale \
|
|
&& docker-php-source extract \
|
|
&& docker-php-ext-configure gd \
|
|
--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 \
|
|
&& docker-php-ext-enable pcntl gd exif zip curl \
|
|
&& curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \
|
|
&& echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \
|
|
&& chmod 755 /usr/bin/composer \
|
|
&& apt-get autoremove --purge -y \
|
|
libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \
|
|
&& rm -rf /var/cache/apt \
|
|
&& docker-php-source delete
|
|
|
|
ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
|
|
|
|
COPY . /var/www/
|
|
|
|
WORKDIR /var/www/
|
|
RUN cp -r storage storage.skel \
|
|
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
|
|
&& composer install --prefer-dist --no-interaction \
|
|
&& rm -rf html && ln -s public html
|
|
|
|
VOLUME /var/www/storage /var/www/bootstrap
|
|
|
|
ENV APP_ENV=production \
|
|
APP_DEBUG=false \
|
|
LOG_CHANNEL=stderr \
|
|
DB_CONNECTION=mysql \
|
|
DB_PORT=3306 \
|
|
DB_HOST=db \
|
|
BROADCAST_DRIVER=log \
|
|
QUEUE_DRIVER=redis \
|
|
HORIZON_PREFIX=horizon-pixelfed \
|
|
REDIS_HOST=redis \
|
|
SESSION_SECURE_COOKIE=true \
|
|
API_BASE="/api/1/" \
|
|
API_SEARCH="/api/search" \
|
|
OPEN_REGISTRATION=true \
|
|
ENFORCE_EMAIL_VERIFICATION=true \
|
|
REMOTE_FOLLOW=false \
|
|
ACTIVITY_PUB=false
|
|
|
|
CMD cp -r storage.skel/* storage/ \
|
|
&& cp -r public/* public.ext/ \
|
|
&& chown -R www-data:www-data storage/ \
|
|
&& php artisan storage:link \
|
|
&& php artisan migrate --force \
|
|
&& php artisan update \
|
|
&& exec php-fpm
|