Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docker fixes #1806

Merged
merged 5 commits into from Nov 2, 2019
Merged

Docker fixes #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8de7de4
use Dockerfile.apache by default
Strubbl Nov 1, 2019
ffe5070
docker db use native password as auth method
Strubbl Nov 1, 2019
d4e1123
docker: expose redis port so the app can connect to it
Strubbl Nov 1, 2019
c62978e
docker: install mysqldump for backup
Strubbl Nov 1, 2019
c864f4b
docker: provide .env to the redis container, too
Strubbl Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion contrib/docker/Dockerfile.apache
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update \
&& 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 \
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 \
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/Dockerfile.fpm
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update \
&& 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 \
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 \
Expand Down
15 changes: 13 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,10 @@ services:

app:
# Comment to use dockerhub image
build: .
build:
context: .
dockerfile: contrib/docker/Dockerfile.apache
#dockerfile: contrib/docker/Dockerfile.fpm
image: pixelfed
restart: unless-stopped
## If you have a traefik running, uncomment this to expose Pixelfed
Expand All @@ -36,7 +39,10 @@ services:

worker: # Comment this whole block if HORIZON_EMBED is true.
# Comment to use dockerhub image
build: .
build:
context: .
dockerfile: contrib/docker/Dockerfile.apache
#dockerfile: contrib/docker/Dockerfile.fpm
image: pixelfed
restart: unless-stopped
env_file:
Expand All @@ -54,6 +60,7 @@ services:
restart: unless-stopped
networks:
- internal
command: --default-authentication-plugin=mysql_native_password
environment:
- MYSQL_DATABASE=pixelfed
- MYSQL_USER=${DB_USERNAME}
Expand All @@ -65,6 +72,10 @@ services:
redis:
image: redis:5-alpine
restart: unless-stopped
env_file:
- ./.env
ports:
- "6379:6379"
volumes:
- "redis-data:/data"
networks:
Expand Down