chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

use Dockerfile.apache by default 

In docker-compose, using a symlink from ./Dockerfile
to contrib/docker/Dockerfile.apache does not work. Therefore the symlink
is deleted and the docker-compose.yml is instructed to use the file
Dockerfile.apache in contrib by default.
This commit is contained in:
Sven Fischer 2019-11-01 18:59:13 +01:00
parent d7455b8f95
commit 8de7de4588
2 changed files with 8 additions and 3 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

10
docker-compose.yml
View File

@ -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
@ -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: