From 892133d0368611fb06ea3dfe76864ac8e18d1db7 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 27 May 2022 15:51:24 +0300 Subject: [PATCH] Parse build information --- .../controllers/api/external_controller.ex | 24 +++++++------------ lib/plausible_web/router.ex | 2 ++ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 1303f566c..6ed4a0771 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -56,16 +56,6 @@ defmodule PlausibleWeb.Api.ExternalController do end def info(conn, _params) do - version_file = Application.app_dir(:plausible, "priv/version.json") - - version = - with {:ok, file} <- File.read(version_file), - {:ok, json} <- Jason.decode(file) do - json - else - _ -> %{} - end - build_metadata = System.get_env("BUILD_METADATA", "{}") |> Jason.decode!() geo_database = @@ -77,11 +67,15 @@ defmodule PlausibleWeb.Api.ExternalController do "(not configured)" end - info = - Map.merge(version, %{ - geo_database: geo_database, - build: build_metadata - }) + info = %{ + geo_database: geo_database, + build: %{ + version: get_in(build_metadata, ["labels", "org.opencontainers.image.version"]), + commit: get_in(build_metadata, ["labels", "org.opencontainers.image.revision"]), + created: get_in(build_metadata, ["labels", "org.opencontainers.image.created"]), + tags: get_in(build_metadata, ["tags"]) + } + } json(conn, info) end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index ac04b287d..fd2ac7615 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -114,6 +114,8 @@ defmodule PlausibleWeb.Router do get "/error", Api.ExternalController, :error get "/health", Api.ExternalController, :health get "/info", Api.ExternalController, :info + get "/system/metadata", Api.ExternalController, :info + get "/system/health", Api.ExternalController, :health post "/paddle/webhook", Api.PaddleController, :webhook