mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 16:24:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1996 from dominikstraessle/patch-1

Browse source 
Fix breaking docker build & Optimize docker build time
This commit is contained in:
daniel 2020-02-09 19:57:59 -07:00 committed by GitHub
commit c076e9a7b6
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/docker/Dockerfile.apache
View file

@ -43,7 +43,9 @@ COPY . /var/www/
WORKDIR /var/www/ WORKDIR /var/www/
RUN cp -r storage storage.skel \ RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
&& composer install --prefer-dist --no-interaction \ && composer install --prefer-dist --no-interaction \
&& composer global remove hirak/prestissimo \
&& rm -rf html && ln -s public html && rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap

23
contrib/docker/Dockerfile.fpm
View file

@ -1,7 +1,6 @@
FROM php:7.3-fpm-buster FROM php:7.4-fpm-buster
ARG COMPOSER_VERSION="1.9.1"
ARG COMPOSER_VERSION="1.8.5" ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17"
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends apt-utils \ && apt-get install -y --no-install-recommends apt-utils \
@ -13,13 +12,12 @@ RUN apt-get update \
&& locale-gen && update-locale \ && locale-gen && update-locale \
&& docker-php-source extract \ && docker-php-source extract \
&& docker-php-ext-configure gd \ && docker-php-ext-configure gd \
--enable-freetype \ --with-freetype \
--with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-jpeg \
--with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ --with-webp \
--with-webp-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm \
&& docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \
&& pecl install imagick \ && docker-php-ext-enable pcntl gd exif zip curl \
&& 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 \ && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \
&& echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \ && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \
&& chmod 755 /usr/bin/composer \ && chmod 755 /usr/bin/composer \
@ -33,9 +31,11 @@ ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
COPY . /var/www/ COPY . /var/www/
WORKDIR /var/www/ WORKDIR /var/www/
RUN mkdir public.ext && cp -r storage storage.skel \ RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
&& composer install --prefer-dist --no-interaction \ && composer install --prefer-dist --no-interaction \
&& composer global remove hirak/prestissimo \
&& rm -rf html && ln -s public html && rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap
@ -59,7 +59,6 @@ ENV APP_ENV=production \
ACTIVITY_PUB=false ACTIVITY_PUB=false
CMD cp -r storage.skel/* storage/ \ CMD cp -r storage.skel/* storage/ \
&& cp -r public/* public.ext/ \
&& chown -R www-data:www-data storage/ \ && chown -R www-data:www-data storage/ \
&& php artisan storage:link \ && php artisan storage:link \
&& php artisan migrate --force \ && php artisan migrate --force \