From 6f7ed8dbc684fbca2e547210063fb4a8559e3b14 Mon Sep 17 00:00:00 2001
From: artiomtr <44021713+ArtiomTr@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:28:36 +0200
Subject: [PATCH 1/2] Add git branch into docker image metadata

Added git branch into docker images, as requested in [#91].

[#91]: https://github.com/blockblaz/lean-quickstart/issues/91
---
 lean_client/Dockerfile | 2 ++
 lean_client/Makefile   | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lean_client/Dockerfile b/lean_client/Dockerfile
index 8512ae4..2786ff4 100644
--- a/lean_client/Dockerfile
+++ b/lean_client/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:22.04
 
 ARG COMMIT_SHA
 ARG BUILD_DATE
+ARG GIT_BRANCH
 
 LABEL org.opencontainers.image.title="grandine"
 LABEL org.opencontainers.image.description="High performance Ethereum lean client"
@@ -9,6 +10,7 @@ LABEL org.opencontainers.image.authors="Grandine <info@grandine.io>"
 LABEL org.opencontainers.image.source=https://github.com/grandinetech/lean
 LABEL org.opencontainers.image.licenses=MIT
 LABEL org.opencontainers.image.revision=$COMMIT_SHA
+LABEL org.opencontainers.image.ref.name=$GIT_BRANCH
 LABEL org.opencontainers.image.created=$BUILD_DATE
 
 ARG TARGETARCH
diff --git a/lean_client/Makefile b/lean_client/Makefile
index 854fafa..ddef64e 100644
--- a/lean_client/Makefile
+++ b/lean_client/Makefile
@@ -10,6 +10,9 @@ DOCKER_TAG ?= unstable
 # Git commit hash of current source version. Used to include metadata into 
 #   docker image.
 COMMIT_SHA := $(shell git rev-parse HEAD)
+# Git branch name, which was used to build current binary. Used to include 
+#   metadata into docker image.
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 # Build date. Used for docker image metadata.
 BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 
@@ -73,21 +76,20 @@ docker: ./target/x86_64-unknown-linux-gnu/release/lean_client ./target/aarch64-u
 		--platform linux/amd64,linux/arm64 \
 		--build-arg COMMIT_SHA=$(COMMIT_SHA) \
 		--build-arg BUILD_DATE=$(BUILD_DATE) \
+		--build-arg GIT_BRANCH=$(GIT_BRANCH) \
 		--tag $(DOCKER_REPO):$(DOCKER_TAG) \
 		--push \
 		.
 
 .PHONY: docker-local
-# docker-local: ./target/x86_64-unknown-linux-gnu/release/lean_client ./target/aarch64-unknown-linux-gnu/release/lean_client
 docker-local: ./target/x86_64-unknown-linux-gnu/release/lean_client
 	@mkdir -p ./bin/amd64
 	@cp ./target/x86_64-unknown-linux-gnu/release/lean_client ./bin/amd64/lean_client
-#	@mkdir -p ./bin/arm64
-#	@cp ./target/aarch64-unknown-linux-gnu/release/lean_client ./bin/arm64/lean_client
 	docker build \
 		--file Dockerfile \
 		--build-arg COMMIT_SHA=$(COMMIT_SHA) \
 		--build-arg BUILD_DATE=$(BUILD_DATE) \
+		--build-arg GIT_BRANCH=$(GIT_BRANCH) \
 		--tag $(DOCKER_REPO):$(DOCKER_TAG) \
 		.
 

From b8ad1bf16ac065e224319c33dcdbeea26b2cb486 Mon Sep 17 00:00:00 2001
From: artiomtr <44021713+ArtiomTr@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:29:58 +0200
Subject: [PATCH 2/2] Add `devnet-2` image tag

Added automatic release to all devnet-* branches, with appropriate tags.
---
 .github/workflows/release.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 08a68c2..1ae098f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches: 
       - main
+      - devnet-*
   workflow_dispatch:
     inputs:
       ref:
@@ -36,5 +37,8 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build & push docker images
+        env:
+          DOCKER_TAG: ${{ (github.ref_name == 'main' && 'unstable') || github.ref_name }}
         run: |
-          make docker
+          make docker \
+            DOCKER_TAG=${{ env.DOCKER_TAG }}