From 2102b492f7d042a7f0494a95df9f8a54e7632f11 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Sun, 14 Apr 2019 23:35:59 +0800 Subject: [PATCH 01/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 7835f6c8b..988691975 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -14,7 +14,7 @@ RUN apt-get update \ --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 pcntl gd exif bcmath intl \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl \ && pecl install imagick \ && docker-php-ext-enable imagick pcntl imagick gd exif \ && a2enmod rewrite remoteip \ From 3e457116b11f5fe56aea87f4917073fa2ea58fe0 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Sun, 14 Apr 2019 23:36:58 +0800 Subject: [PATCH 02/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 988691975..cf1ba591e 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -14,7 +14,7 @@ RUN apt-get update \ --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_pgsql pdo_sqlite pcntl gd exif bcmath intl \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl \ && pecl install imagick \ && docker-php-ext-enable imagick pcntl imagick gd exif \ && a2enmod rewrite remoteip \ From 7591348fe4086318c111b1faa47ce1f00a644ff9 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Sun, 14 Apr 2019 23:42:12 +0800 Subject: [PATCH 03/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index cf1ba591e..07e25d351 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ - optipng pngquant jpegoptim gifsicle \ + optipng pngquant jpegoptim gifsicle libpq-dev \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ && docker-php-source extract \ From 58c740b8028d7a0102294db5a0e9665b3f09e8b3 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 15 Apr 2019 11:08:16 +0800 Subject: [PATCH 04/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 07e25d351..9e0d15ab1 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -5,9 +5,11 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ - optipng pngquant jpegoptim gifsicle libpq-dev \ + optipng pngquant jpegoptim gifsicle libpq-dev locales \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ + && sed -i '/en_US/s/^#//g' /etc/locale.gen \ + && locale-gen && update-locale \ && docker-php-source extract \ && docker-php-ext-configure gd \ --with-freetype-dir=/usr/lib/x86_64-linux-gnu/ \ From 7f806406bae6ad35740f79fbcc733ad401ee5010 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 15 Apr 2019 11:20:47 +0800 Subject: [PATCH 05/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index fc7524429..d297cc654 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -5,16 +5,18 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef RUN apt-get update \ && apt-get install -y --no-install-recommends git \ - optipng pngquant jpegoptim gifsicle \ + optipng pngquant jpegoptim gifsicle libpq-dev locales \ libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ + && sed -i '/en_US/s/^#//g' /etc/locale.gen \ + && locale-gen && update-locale \ && docker-php-source extract \ && docker-php-ext-configure gd \ --with-freetype-dir=/usr/lib/x86_64-linux-gnu/ \ --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ --with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \ - && docker-php-ext-install pdo_mysql pcntl gd exif bcmath \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath \ && pecl install imagick \ && docker-php-ext-enable imagick pcntl imagick gd exif \ && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \ From d221ca36b7dbd059f94fe74ed2723e736ba342b5 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 00:13:49 +0800 Subject: [PATCH 06/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 9e0d15ab1..b951ef16d 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ - optipng pngquant jpegoptim gifsicle libpq-dev locales \ + optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ From ca134b7b1b6f068baaaf101225b7162d965c644b Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 00:13:55 +0800 Subject: [PATCH 07/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index d297cc654..88ddf4626 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef RUN apt-get update \ && apt-get install -y --no-install-recommends git \ - optipng pngquant jpegoptim gifsicle libpq-dev locales \ + optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales \ libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ From 84d413430682078e5084d52a70146f33966bbb11 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 01:12:07 +0800 Subject: [PATCH 08/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index b951ef16d..3801c7474 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -1,7 +1,7 @@ FROM php:7.2-apache -ARG COMPOSER_VERSION="1.6.5" -ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" +ARG COMPOSER_VERSION="1.8.5" +ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ @@ -43,7 +43,7 @@ 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-source --no-interaction \ + && composer install --no-dev --prefer-source --no-interaction \ && rm -rf html && ln -s public html VOLUME ["/var/www/storage"] From 6e6a49096aa1e01f7916a30f4ee21ec915b1c574 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 01:12:57 +0800 Subject: [PATCH 09/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 88ddf4626..ec222a0a6 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -1,7 +1,7 @@ FROM php:7.2-fpm -ARG COMPOSER_VERSION="1.6.5" -ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" +ARG COMPOSER_VERSION="1.8.5" +ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" RUN apt-get update \ && apt-get install -y --no-install-recommends git \ @@ -34,7 +34,7 @@ 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 \ + && composer install --no-dev --prefer-dist --no-interaction \ && rm -rf html && ln -s public html VOLUME ["/var/www/storage", "/var/www/public.ext"] From 37266ff3cf68d0f27ce5f1db6e288f51c301964d Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 11:35:14 +0800 Subject: [PATCH 10/29] Update .env.example --- .env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 92f6cb3ce..a807ab5c7 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,8 @@ APP_URL=http://localhost ADMIN_DOMAIN="localhost" APP_DOMAIN="localhost" +SESSION_DOMAIN="localhost" +SESSION_SECURE_COOKIE=true LOG_CHANNEL=stack @@ -35,8 +37,6 @@ MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="pixelfed@example.com" MAIL_FROM_NAME="Pixelfed" -SESSION_DOMAIN="${APP_DOMAIN}" -SESSION_SECURE_COOKIE=true API_BASE="/api/1/" API_SEARCH="/api/search" From a649fda5f92359c0b364fa0e05c9a1978bd78be1 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:14:13 +0800 Subject: [PATCH 11/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index ec222a0a6..942f4fd95 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df0 RUN apt-get update \ && apt-get install -y --no-install-recommends git \ - optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales \ + optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev \ libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ From 601ac77baa482c59e6dbff68a75709567924de28 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:15:06 +0800 Subject: [PATCH 12/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 3801c7474..44dcc6f2d 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df0 RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ - optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales \ + optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ @@ -16,9 +16,9 @@ RUN apt-get update \ --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 \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip \ && pecl install imagick \ - && docker-php-ext-enable imagick pcntl imagick gd exif \ + && docker-php-ext-enable imagick pcntl imagick gd exif zip \ && a2enmod rewrite remoteip \ && {\ echo RemoteIPHeader X-Real-IP ;\ From 2aeb2357f336147f0a815e6b28e588c8ee58a956 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:16:15 +0800 Subject: [PATCH 13/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 942f4fd95..3376c407d 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -16,9 +16,9 @@ RUN apt-get update \ --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ --with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \ - && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip \ && pecl install imagick \ - && docker-php-ext-enable imagick pcntl imagick gd exif \ + && docker-php-ext-enable imagick pcntl imagick gd exif zip \ && 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 \ From 62300230c8fdce18c0456d6314bef018d07917f4 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:39:19 +0800 Subject: [PATCH 14/29] Update docker-compose.yml --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a010930a4..36930ed45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,8 @@ services: env_file: - ./.env volumes: - - "app-storage:/var/www/storage" + - "./storage:/var/www/storage" + - "./bootstrap:/var/www/bootstrap" networks: - external - internal From a250562be813ad5ad5700560a2f99adc47d2aaed Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:50:55 +0800 Subject: [PATCH 15/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 3376c407d..04e209ae0 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -34,7 +34,7 @@ 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 --no-dev --prefer-dist --no-interaction \ + && composer install --prefer-dist --no-interaction \ && rm -rf html && ln -s public html VOLUME ["/var/www/storage", "/var/www/public.ext"] From a3e7bf19f9e77552c2b29e97e2b59b4f838b0582 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 13:50:56 +0800 Subject: [PATCH 16/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 44dcc6f2d..0e8e6fffb 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -43,7 +43,7 @@ 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 --no-dev --prefer-source --no-interaction \ + && composer install --prefer-source --no-interaction \ && rm -rf html && ln -s public html VOLUME ["/var/www/storage"] From 602662d99145a35395e64d0d4b1c897aa28aabad Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 14:18:40 +0800 Subject: [PATCH 17/29] Update docker-compose.yml --- docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 36930ed45..652d00435 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,8 @@ services: env_file: - ./.env volumes: - - "./storage:/var/www/storage" - - "./bootstrap:/var/www/bootstrap" + - "app-storage:/var/www/storage" + - "app-bootstrap:/var/www/bootstrap" networks: - external - internal @@ -65,6 +65,7 @@ volumes: redis-data: db-data: app-storage: + app-bootstrap: networks: internal: From 5eadd62e517147fc258854b770a34d48f1631985 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 16 Apr 2019 14:18:53 +0800 Subject: [PATCH 18/29] Update Dockerfile.apache --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 0e8e6fffb..d42602a14 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -46,7 +46,7 @@ RUN cp -r storage storage.skel \ && composer install --prefer-source --no-interaction \ && rm -rf html && ln -s public html -VOLUME ["/var/www/storage"] +VOLUME /var/www/storage /var/www/bootstrap ENV APP_ENV=production \ APP_DEBUG=false \ From 9477e359531245a3c34e994883d31b3d47447338 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Thu, 18 Apr 2019 15:35:22 +0800 Subject: [PATCH 19/29] Update .env.example --- .env.example | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index a807ab5c7..8795154a7 100644 --- a/.env.example +++ b/.env.example @@ -54,17 +54,18 @@ MIX_APP_URL="${APP_URL}" MIX_API_BASE="${API_BASE}" MIX_API_SEARCH="${API_SEARCH}" -ACTIVITYPUB_INBOX=false -ACTIVITYPUB_SHAREDINBOX=false HORIZON_DARKMODE=true -# Set these both "true" to enable federation. +ACTIVITY_PUB=false +REMOTE_FOLLOW=false +ACTIVITYPUB_INBOX=false +ACTIVITYPUB_SHAREDINBOX=false +# Set these "true" to enable federation. # You might need to also run: # php artisan cache:clear # php artisan optimize:clear # php artisan optimize -ACTIVITY_PUB=false -REMOTE_FOLLOW=false + CS_BLOCKED_DOMAINS='example.org,example.net,example.com' CS_CW_DOMAINS='example.org,example.net,example.com' From 105a7486b7cf2a60781d86edc56e337c11ac448f Mon Sep 17 00:00:00 2001 From: Shleeble Date: Thu, 18 Apr 2019 22:23:47 +0800 Subject: [PATCH 20/29] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 652d00435..c6b28d0a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,7 +54,7 @@ services: - "db-data:/var/lib/mysql" redis: - image: redis:4-alpine + image: redis:5-alpine volumes: - "redis-data:/data" networks: From 15c3bed16c25dd159cb373f8320b9cc4b4149590 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Thu, 18 Apr 2019 22:25:12 +0800 Subject: [PATCH 21/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 04e209ae0..3d499e412 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -37,7 +37,7 @@ RUN cp -r storage storage.skel \ && composer install --prefer-dist --no-interaction \ && rm -rf html && ln -s public html -VOLUME ["/var/www/storage", "/var/www/public.ext"] +VOLUME /var/www/storage /var/www/bootstrap ENV APP_ENV=production \ APP_DEBUG=false \ From 24358c1acbc8b5166cfbb0eee037d0688fd6a535 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Fri, 19 Apr 2019 01:32:36 +0800 Subject: [PATCH 22/29] Update start.sh --- contrib/docker/start.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/contrib/docker/start.sh b/contrib/docker/start.sh index 7bc26c0db..27fb0cfe5 100755 --- a/contrib/docker/start.sh +++ b/contrib/docker/start.sh @@ -1,20 +1,15 @@ #!/bin/bash # Create the storage tree if needed and fix permissions -cp -r storage.skel/* storage/ -chown -R www-data:www-data storage/ bootstrap/cache/ +#cp -r storage.skel/* storage/ +chown -R www-data:www-data storage/ bootstrap/ php artisan storage:link # Migrate database if the app was upgraded -gosu www-data:www-data php artisan migrate --force +# gosu www-data:www-data php artisan migrate --force # Run other specific migratins if required -gosu www-data:www-data php artisan update - -# Run a worker if it is set as embedded -if [ "$HORIZON_EMBED" = "true" ]; then - gosu www-data:www-data php artisan horizon & -fi +# gosu www-data:www-data php artisan update # Finally run Apache exec apache2-foreground From 1ee7e776a1b5ca581ad248ca283ae306ffc34448 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 10:36:28 +0800 Subject: [PATCH 23/29] Update Dockerfile.fpm --- contrib/docker/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 3d499e412..3cc9a3f46 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -4,7 +4,7 @@ ARG COMPOSER_VERSION="1.8.5" ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" RUN apt-get update \ - && apt-get install -y --no-install-recommends git \ + && apt-get install -y --no-install-recommends git gosu \ optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev \ libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ From b43588d32089fcd6d20e79a9984179be12e98e36 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 10:36:58 +0800 Subject: [PATCH 24/29] Update start.sh --- contrib/docker/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/start.sh b/contrib/docker/start.sh index 27fb0cfe5..3468f519c 100755 --- a/contrib/docker/start.sh +++ b/contrib/docker/start.sh @@ -1,7 +1,7 @@ #!/bin/bash # Create the storage tree if needed and fix permissions -#cp -r storage.skel/* storage/ +cp -r storage.skel/* storage/ chown -R www-data:www-data storage/ bootstrap/ php artisan storage:link From d2e977741b55c0cc11d9131c21e3c553a1ed4403 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 10:40:32 +0800 Subject: [PATCH 25/29] Update docker-compose.yml --- docker-compose.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c6b28d0a1..f93e77d77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,8 +13,8 @@ version: '3' services: app: - # Uncomment to build a local copy of the image - # build: . + # Comment to use dockerhub image + build: . image: pixelfed # If you have a traefik running, uncomment this to expose Pixelfed # labels: @@ -30,16 +30,18 @@ services: - external - internal - # Uncomment if you set HORIZON_EMBED to false and wish to run a local worker - # worker: - # image: pixelfed - # env_file: - # - ./.env - # volumes: - # - "app-storage:/var/www/storage" - # networks: - # - internal - # command: gosu www-data php artisan horizon + worker: + # Comment to use dockerhub image + build: . + image: pixelfed + env_file: + - ./.env + volumes: + - "app-storage:/var/www/storage" + - "app-bootstrap:/var/www/bootstrap" + networks: + - internal + command: gosu www-data php artisan horizon db: image: mysql:5.7 From 9e497142f3b6cbb3740fcfbe043b8128ffc32e6d Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 10:50:20 +0800 Subject: [PATCH 26/29] Update .env.example --- .env.example | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 8795154a7..6ba412c34 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ APP_NAME="PixelFed Test" APP_ENV=local -APP_KEY= +APP_KEY=base64:<32-character-base64> APP_DEBUG=true APP_URL=http://localhost @@ -54,8 +54,6 @@ MIX_APP_URL="${APP_URL}" MIX_API_BASE="${API_BASE}" MIX_API_SEARCH="${API_SEARCH}" -HORIZON_DARKMODE=true - ACTIVITY_PUB=false REMOTE_FOLLOW=false ACTIVITYPUB_INBOX=false @@ -70,3 +68,7 @@ ACTIVITYPUB_SHAREDINBOX=false CS_BLOCKED_DOMAINS='example.org,example.net,example.com' CS_CW_DOMAINS='example.org,example.net,example.com' CS_UNLISTED_DOMAINS='example.org,example.net,example.com' + + +## Optional +HORIZON_DARKMODE=true # Horizon theme darkmode From d8d7b93c401bc4e6a14b50d0439603bda924a5a6 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 10:51:00 +0800 Subject: [PATCH 27/29] Update .env.example --- .env.example | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 6ba412c34..eee520369 100644 --- a/.env.example +++ b/.env.example @@ -64,11 +64,10 @@ ACTIVITYPUB_SHAREDINBOX=false # php artisan optimize:clear # php artisan optimize - +PF_COSTAR_ENABLED=false CS_BLOCKED_DOMAINS='example.org,example.net,example.com' CS_CW_DOMAINS='example.org,example.net,example.com' CS_UNLISTED_DOMAINS='example.org,example.net,example.com' - ## Optional HORIZON_DARKMODE=true # Horizon theme darkmode From cf9d6eb52d626c396a7abec12fb76b63b267726a Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 12:12:01 +0800 Subject: [PATCH 28/29] Update .env.example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index eee520369..accd294ba 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,7 @@ ADMIN_DOMAIN="localhost" APP_DOMAIN="localhost" SESSION_DOMAIN="localhost" SESSION_SECURE_COOKIE=true +TRUST_PROXIES="*" LOG_CHANNEL=stack From c8de214adbcfc7d483f05e30adcbd21626db0da9 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Mon, 22 Apr 2019 12:20:47 +0800 Subject: [PATCH 29/29] Update .env.example --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index accd294ba..f5f44745b 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ APP_NAME="PixelFed Test" APP_ENV=local -APP_KEY=base64:<32-character-base64> +APP_KEY= APP_DEBUG=true APP_URL=http://localhost