From 8de7de4588f82ae9b82b9b87ed5d6612143b39c8 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 18:59:13 +0100 Subject: [PATCH] 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. --- Dockerfile | 1 - docker-compose.yml | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) delete mode 120000 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 120000 index 2f722aa37..000000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -contrib/docker/Dockerfile.apache \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3d9cccc02..0d6c501a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: