add /var/lib/plausible

Dockerfile

@@ -71,9 +71,15 @@ RUN apk add --no-cache openssl ncurses libstdc++ libgcc ca-certificates
 COPY --from=buildcontainer --chmod=a+rX /app/_build/${MIX_ENV}/rel/plausible /app
 COPY --chmod=755 ./rel/docker-entrypoint.sh /entrypoint.sh
 
+# we need to allow "others" access to app folder, because
+# docker container can be started with arbitrary uid
+RUN mkdir -p /var/lib/plausible && chmod ugo+rw -R /var/lib/plausible
+
 USER 999
 WORKDIR /app
 ENV LISTEN_IP=0.0.0.0
 ENTRYPOINT ["/entrypoint.sh"]
 EXPOSE 8000
+ENV DEFAULT_DATA_DIR=/var/lib/plausible
+VOLUME /var/lib/plausible
 CMD ["run"]

config/runtime.exs

@@ -232,7 +232,8 @@ maxmind_edition = get_var_from_path_or_env(config_dir, "MAXMIND_EDITION", "GeoLi
 data_dir = get_var_from_path_or_env(config_dir, "DATA_DIR")
 persistent_cache_dir = get_var_from_path_or_env(config_dir, "PERSISTENT_CACHE_DIR")
 
-data_dir = data_dir || persistent_cache_dir
+# DEFAULT_DATA_DIR comes from the container image, please see our Dockerfile
+data_dir = data_dir || persistent_cache_dir || System.get_env("DEFAULT_DATA_DIR")
 persistent_cache_dir = persistent_cache_dir || data_dir
 
 enable_email_verification =

lib/plausible/imported/csv_importer.ex

@@ -323,7 +323,9 @@ defmodule Plausible.Imported.CSVImporter do
   @doc """
   Returns local directory for CSV imports storage.
 
-  Builds upon `$DATA_DIR` or `$PERSISTENT_CACHE_DIR` (if set) and falls back to /tmp
+  Builds upon `$DATA_DIR`, `$PERSISTENT_CACHE_DIR` or `$DEFAULT_DATA_DIR` (if set) and falls back to /tmp.
+
+  `$DEFAULT_DATA_DIR` is set to `/var/lib/plausible` in container images.
 
   Examples:
 

test/plausible/config_test.exs

@@ -295,6 +295,42 @@ defmodule Plausible.ConfigTest do
   end
 
   describe "storage" do
+    test "defaults" do
+      env = [
+        {"MAXMIND_LICENSE_KEY", "abc"},
+        {"PERSISTENT_CACHE_DIR", nil},
+        {"DATA_DIR", nil}
+      ]
+
+      config = runtime_config(env)
+
+      # exports/imports
+      assert get_in(config, [:plausible, :data_dir]) == nil
+      # locus (mmdb cache)
+      assert get_in(config, [:plausible, Plausible.Geo, :cache_dir]) == "/var/lib/plausible"
+      # tzdata (timezones cache)
+      assert get_in(config, [:tzdata, :data_dir]) == "/var/lib/plausible/tzdata_data"
+    end
+
+    test "defaults in container" do
+      env = [
+        {"MAXMIND_LICENSE_KEY", "abc"},
+        {"PERSISTENT_CACHE_DIR", nil},
+        {"DATA_DIR", nil},
+        # please see our Dockerfile
+        {"DEFAULT_DATA_DIR", "/var/lib/plausible"}
+      ]
+
+      config = runtime_config(env)
+
+      # exports/imports
+      assert get_in(config, [:plausible, :data_dir]) == "/var/lib/plausible"
+      # locus (mmdb cache)
+      assert get_in(config, [:plausible, Plausible.Geo, :cache_dir]) == "/var/lib/plausible"
+      # tzdata (timezones cache)
+      assert get_in(config, [:tzdata, :data_dir]) == "/var/lib/plausible/tzdata_data"
+    end
+
     test "with only DATA_DIR set" do
       env = [
         {"MAXMIND_LICENSE_KEY", "abc"},