From 5b5c70b82dee08aaaccee88a35e97e411f6a6e9a Mon Sep 17 00:00:00 2001
From: Uku Taht <uku.taht@gmail.com>
Date: Fri, 27 May 2022 14:30:21 +0300
Subject: [PATCH] Add build metadata to build arg

---
 .github/workflows/docker.yml                  | 19 +++++--------------
 .../controllers/api/external_controller.ex    |  5 ++++-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5d2714647..4762b2294 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,13 +12,6 @@ jobs:
     runs-on: buildjet-4vcpu-ubuntu-2004
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: extract_branch
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -40,17 +33,15 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      -
-        name: Build and push
+      - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=plausible/analytics:${{ steps.extract_branch.outputs.branch }}
-          cache-to: type=inline
-      -
-        name: Image digest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: BUILD_METADATA=${{ steps.meta.outputs.json }}
+      - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex
index 543e644a5..f1c9bf2a1 100644
--- a/lib/plausible_web/controllers/api/external_controller.ex
+++ b/lib/plausible_web/controllers/api/external_controller.ex
@@ -66,6 +66,8 @@ defmodule PlausibleWeb.Api.ExternalController do
         _ -> %{}
       end
 
+    build_info = System.get_env("BUILD_METADATA", "{}") |> Jason.decode!()
+
     geo_database =
       case Geolix.metadata([:geolocation]) do
         %{geolocation: %{database_type: type}} ->
@@ -77,7 +79,8 @@ defmodule PlausibleWeb.Api.ExternalController do
 
     info =
       Map.merge(version, %{
-        geo_database: geo_database
+        geo_database: geo_database,
+        build: build_info
       })
 
     json(conn, info)