Docker fix and tweak (#1781)

* Fix image building with recent docker version * Mount media path in docker to prevent data loss
matrix-org · Mar 3, 2021 · 41fd15b · 41fd15b
1 parent 25dc99f
commit 41fd15b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/build/docker/Dockerfile.monolith b/build/docker/Dockerfile.monolith
@@ -14,7 +14,7 @@ RUN go build -trimpath -o bin/ ./cmd/generate-keys
 
 FROM alpine:latest
 
-COPY --from=base /build/bin/* /usr/bin
+COPY --from=base /build/bin/* /usr/bin/
 
 VOLUME /etc/dendrite
 WORKDIR /etc/dendrite

diff --git a/build/docker/Dockerfile.polylith b/build/docker/Dockerfile.polylith
@@ -14,7 +14,7 @@ RUN go build -trimpath -o bin/ ./cmd/generate-keys
 
 FROM alpine:latest
 
-COPY --from=base /build/bin/* /usr/bin
+COPY --from=base /build/bin/* /usr/bin/
 
 VOLUME /etc/dendrite
 WORKDIR /etc/dendrite

diff --git a/build/docker/docker-compose.monolith.yml b/build/docker/docker-compose.monolith.yml
@@ -12,6 +12,7 @@ services:
       - 8448:8448
     volumes:
       - ./config:/etc/dendrite
+      - ./media:/var/dendrite/media
     networks:
       - internal
 

diff --git a/build/docker/docker-compose.polylith.yml b/build/docker/docker-compose.polylith.yml
@@ -15,6 +15,7 @@ services:
     command: mediaapi
     volumes:
       - ./config:/etc/dendrite
+      - ./media:/var/dendrite/media
     networks:
       - internal