From 3396218ff0b318e701d8da9b46ffd31628656011 Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Tue, 8 Jan 2019 18:17:52 +0100 Subject: [PATCH] chore: update Dockerfile Former-commit-id: 2ce789dc1facaee4afb7edcdd922f304b0b2cd69 [formerly 52c535b516b35996190d4bceded1502b622bed10] [formerly edc3b73e09591edf8bb352f047fe64da39c58f4e [formerly 5a0547b467b58bdd96f189da79e44a41bc1704a9]] Former-commit-id: 87c2a4a3e4002a0a676470f9fda207486673b525 [formerly 0d790b609d7b0d96dc273f2241dedb0695b8d351] Former-commit-id: 56b586a9cf0f851ad69b1db9e8e7046b5d57523f --- .filebrowser.docker.json => .docker.json | 0 Dockerfile | 3 +-- frontend | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename .filebrowser.docker.json => .docker.json (100%) diff --git a/.filebrowser.docker.json b/.docker.json similarity index 100% rename from .filebrowser.docker.json rename to .docker.json diff --git a/Dockerfile b/Dockerfile index 5409c2d3..b1ded66c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM scratch COPY --from=filebrowser/dev /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -VOLUME /tmp VOLUME /srv EXPOSE 80 -COPY .filebrowser.docker.json /.filebrowser.json +COPY .docker.json /.filebrowser.json COPY filebrowser /filebrowser ENTRYPOINT [ "/filebrowser" ] diff --git a/frontend b/frontend index 2ed87feb..0e7d4ef1 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 2ed87febcb71c71588f53d5b6ed560cd5c99f526 +Subproject commit 0e7d4ef110ee550375d4bf15dfa9ded70214076a