UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize build process, add Horizon publishing

Browse source
This commit is contained in:
Kovah 2022-10-30 16:34:54 +01:00 committed by Mehdi Zakaria Benadel (Rebase PR Action)
parent 7e8f962db5
commit 0ecb3ed960
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-docker.yml vendored
View file

@ -35,3 +35,5 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true push: true
tags: kovah/pixelfed-docker:latest tags: kovah/pixelfed-docker:latest
cache-from: type=registry,ref=user/app:latest
cache-to: type=inline

9
contrib/docker/Dockerfile.apache
View file

@ -4,9 +4,6 @@ ENV COMPOSER_MEMORY_LIMIT=-1
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /var/www/ WORKDIR /var/www/
# Use the default production configuration
COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini"
# Get Composer binary # Get Composer binary
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
@ -86,12 +83,18 @@ RUN apt-get update \
&& rm -rf /var/cache/apt \ && rm -rf /var/cache/apt \
&& rm -rf /var/lib/apt/lists/ && rm -rf /var/lib/apt/lists/
# Use the default production configuration
COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini"
COPY . /var/www/ COPY . /var/www/
# for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862 # 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 \ RUN cp -r storage storage.skel \
&& composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \ && composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
&& rm -rf html && ln -s public html \ && rm -rf html && ln -s public html \
&& chown -R www-data:www-data /var/www && chown -R www-data:www-data /var/www
RUN php artisan horizon:publish
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap
CMD ["/var/www/contrib/docker/start.apache.sh"] CMD ["/var/www/contrib/docker/start.apache.sh"]