From dd2d02e4924edddfe931748ac7665d15d5684970 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 18 Apr 2018 12:53:22 +0200
Subject: [PATCH] fix309: merge CMD in the dockerfile to ENTRYPOINT (#397)

Former-commit-id: ca81d11e477ac00abf2998b69425f00a0fa9bfd3 [formerly 262790d3b7ddd904b38fc926658e275531ced99b] [formerly 7d2d31e627d5df0d2f78362a43a27d80725dd4be [formerly f7fdd6cc92ce1a733d062a6500e4ab3032eb8e3e]]
Former-commit-id: 097da2311051673f5bea9f851f1451938a7d1935 [formerly b7922bd40d932e03493345cdaca0541150d9a44e]
Former-commit-id: 6b915b5d648575b857d51dc885de675616509d18
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91a8bd82..76f21535 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,5 +21,4 @@ EXPOSE 80
 
 COPY Docker.json /config.json
 
-ENTRYPOINT ["/filebrowser"]
-CMD ["--config", "/config.json"]
+ENTRYPOINT ["/filebrowser", "--config", "/config.json"]