浏览代码

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.
Sven Fischer 5 年之前
父节点
当前提交
8de7de4588
共有 2 个文件被更改,包括 8 次插入3 次删除
  1. 0 1
      Dockerfile
  2. 8 2
      docker-compose.yml

+ 0 - 1
Dockerfile

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

+ 8 - 2
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: