From b608d15313cc6f194093a222d38547e256c046b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6chst?= <git@jonashoechst.de>
Date: Mon, 8 Jul 2024 18:16:23 +0200
Subject: [PATCH] updated debian, added git dependency, bump version

---
 .github/workflows/tests.yml | 2 +-
 .gitignore                  | 1 +
 CHANGELOG.md                | 6 +++++-
 Dockerfile                  | 8 +++++---
 action.yml                  | 2 +-
 docker-compose.yml          | 1 -
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1ffdacd..588d168 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
           submodules: recursive
 
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y binfmt-support fdisk file kpartx lsof p7zip-full qemu qemu-user-static unzip wget xz-utils units
+        run: sudo apt-get update && sudo apt-get install -y binfmt-support fdisk file git kpartx lsof p7zip-full qemu qemu-user-static unzip wget xz-utils units
         shell: bash
 
       - name: Run pimod OpenWRT example
diff --git a/.gitignore b/.gitignore
index 29e5a0f..dbb5018 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 **/*.img
 .cache/
+CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b325c8..accac98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,9 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    The title should be `${VERSION} - ${YYYY-MM-DD}` and the description should contain the section from this `CHANGELOG.md`.
 
 ## [Unreleased]
+
+## [0.6.1] - 2024-07-08
 ### Added
 - Building Docker images for linux/arm/v7.
 - Configure Renovate for automated updates.
+- Installed git in docker container to support git-based versioning
 
 ### Changed
 - Reworked the README to ease readability and understanding of pimod's internals.
@@ -107,7 +110,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release of a working version of pimod.
 
-[Unreleased]: https://github.com/Nature40/pimod/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/Nature40/pimod/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/Nature40/pimod/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/Nature40/pimod/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/Nature40/pimod/compare/v0.4.4...v0.5.0
 [0.4.4]: https://github.com/Nature40/pimod/compare/v0.4.3...v0.4.4
diff --git a/Dockerfile b/Dockerfile
index af9f7d6..141c0a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 LABEL description="Reconfigure Raspberry Pi images with an easy, Docker-like configuration file"
 LABEL maintainer="hoechst@mathematik.uni-marburg.de"
-LABEL version="0.6.0"
+LABEL version="0.6.1"
+
+RUN bash
 
 RUN apt-get update && \
   apt-get install -y \
   binfmt-support \
   fdisk \
   file \
+  git \
   kpartx \
   lsof \
   p7zip-full \
-  qemu \
   qemu-user-static \
   unzip \
   wget \
diff --git a/action.yml b/action.yml
index bee030a..609a03d 100644
--- a/action.yml
+++ b/action.yml
@@ -14,7 +14,7 @@ runs:
   steps:
     - run: sudo apt-get update
       shell: bash
-    - run: sudo apt-get install -y binfmt-support fdisk file kpartx qemu qemu-user-static unzip p7zip-full wget xz-utils units
+    - run: sudo apt-get install -y binfmt-support fdisk file git kpartx qemu qemu-user-static unzip p7zip-full wget xz-utils units
       shell: bash
     - run: sudo ${{ github.action_path }}/pimod.sh ${{ inputs.pifile }}
       shell: bash
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c110bb..facb4c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
     pimod:
         build: .