From 2472a2815c2e5a9ecf2fb6b42532e00bc0d5ce09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?= <kueffner.markus@gmail.com>
Date: Sat, 9 Nov 2024 17:35:43 +0100
Subject: [PATCH] generate version files for klipper and moonraker during build

---
 CHANGELOG.md                | 1 +
 docker/klipper/Dockerfile   | 1 +
 docker/moonraker/Dockerfile | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a57f96..502a229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 <!--
 ## [Unreleased]
 ### Added
+* klipper & moonraker: generate version file during build to correctly display versions
 ### Fixed
 ### Changed
 ### Removed
diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile
index 7954dbc..146d8fa 100644
--- a/docker/klipper/Dockerfile
+++ b/docker/klipper/Dockerfile
@@ -18,6 +18,7 @@ ARG VERSION=master
 RUN git clone ${REPO} klipper \
  && cd klipper \
  && git checkout ${VERSION} \
+ && python3 scripts/make_version.py prind > klippy/.version \
  && rm -rf .git
 
 RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile
index c00db83..03297ce 100644
--- a/docker/moonraker/Dockerfile
+++ b/docker/moonraker/Dockerfile
@@ -13,6 +13,7 @@ ARG VERSION=master
 RUN git clone ${REPO} moonraker \
  && cd moonraker \
  && git checkout ${VERSION} \
+ && echo -n $(git describe --tags)-prind > moonraker/.version \
  && rm -rf .git
 
 RUN python -m venv venv \