From 26847dc9706097536b04254c1dcf903f7ff0b702 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 25 Oct 2021 11:27:17 +0200 Subject: [PATCH] Remove default config file in docker images Since this file cannot be changed inside the image, and people need to specify a new file or env variables, it doesn't make sense to add it. Also if it is present, it is preferred to the env variables. --- docker/dockerfiles/joex.dockerfile | 3 ++- docker/dockerfiles/restserver.dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile index 05a49367..176cbea2 100644 --- a/docker/dockerfiles/joex.dockerfile +++ b/docker/dockerfiles/joex.dockerfile @@ -62,7 +62,8 @@ WORKDIR /opt RUN wget ${joex_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-joex-$version.zip} && \ unzip docspell-joex-*.zip && \ rm docspell-joex-*.zip && \ - ln -snf docspell-joex-* docspell-joex + ln -snf docspell-joex-* docspell-joex && \ + rm docspell-joex/conf/docspell-joex.conf # Using these data files for japanese, because they work better. See #973 RUN \ diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile index aa39cfe8..1b0e59e4 100644 --- a/docker/dockerfiles/restserver.dockerfile +++ b/docker/dockerfiles/restserver.dockerfile @@ -12,7 +12,8 @@ WORKDIR /opt RUN wget ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \ unzip docspell-restserver-*.zip && \ rm docspell-restserver-*.zip && \ - ln -snf docspell-restserver-* docspell-restserver + ln -snf docspell-restserver-* docspell-restserver && \ + rm docspell-restserver/conf/docspell-server.conf ENTRYPOINT ["/opt/docspell-restserver/bin/docspell-restserver", "-J-XX:+UseG1GC"] EXPOSE 7880