UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 13:33:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1806 from Strubbl/docker-fixes

Browse source 
Docker fixes
This commit is contained in:
daniel 2019-11-01 20:13:54 -06:00 committed by GitHub
commit 1ff1d12d82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -1 +0,0 @@
contrib/docker/Dockerfile.apache

2
contrib/docker/Dockerfile.apache
View file

@ -8,7 +8,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends git gosu \ && 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 \ 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 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 \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \
&& locale-gen && update-locale \ && locale-gen && update-locale \
&& docker-php-source extract \ && docker-php-source extract \

2
contrib/docker/Dockerfile.fpm
View file

@ -8,7 +8,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends git gosu \ && 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 \ 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 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 \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \
&& locale-gen && update-locale \ && locale-gen && update-locale \
&& docker-php-source extract \ && docker-php-source extract \

15
docker-compose.yml
View file

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