diff options
| author | stoically <stoically@protonmail.com> | 2021-03-03 12:20:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 11:20:40 +0000 |
| commit | 41fd15b9b659bab1220c0a4868a8a478d70b7180 (patch) | |
| tree | 85eb2da7471708ee464224b9c419132f6b5eb1bd | |
| parent | 25dc99f1b0e7df599a82acbda5f9efe71b093caf (diff) | |
Docker fix and tweak (#1781)
* Fix image building with recent docker version
* Mount media path in docker to prevent data loss
| -rw-r--r-- | build/docker/Dockerfile.monolith | 2 | ||||
| -rw-r--r-- | build/docker/Dockerfile.polylith | 2 | ||||
| -rw-r--r-- | build/docker/docker-compose.monolith.yml | 1 | ||||
| -rw-r--r-- | build/docker/docker-compose.polylith.yml | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/build/docker/Dockerfile.monolith b/build/docker/Dockerfile.monolith index eb099c4c..e59fd087 100644 --- 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 index 1a7ba193..5cb53bbd 100644 --- 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 index 024183aa..ef8975b9 100644 --- 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 index e95e1957..5174830b 100644 --- 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 |