From 3be44f6de93a3279c70a6663be1e1783897b0a13 Mon Sep 17 00:00:00 2001
From: Antoine <antoinroux@hotmail.fr>
Date: Wed, 13 Jan 2021 00:38:15 +0100
Subject: [PATCH] add version to packer output image

---
 docker-compose.yml                     | 11 ++++++-----
 image/assets/hcl/source-debian.pkr.hcl |  2 +-
 image/assets/hcl/variable.pkr.hcl      |  5 +++++
 image/assets/run-packer.sh             |  3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5d32ee9..4836673 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,12 +25,13 @@ services:
          - SOURCE_NAME=qemu.debian
          - SSH_LIVE_USERNAME=debian
          - SSH_LIVE_PASSWORD=debian
-         - ANSIBLE_EXTRA_VARS=generated_user=antoine generated_group=users debian_version=10.7.0
+         - IMAGE_VERSION=10.7.0
+         - ANSIBLE_EXTRA_VARS=generated_user=antoine generated_group=users
          - ANSIBLE_PLAYBOOK=/packer/ansible/playbook-debian.yml
-        #- ISO_CHECKSUM=file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA512SUMS
-         - ISO_CHECKSUM=file:https://cdimage.debian.org/mirror/cdimage/archive/10.7.0/amd64/iso-cd/SHA512SUMS
-        #- ISO_URL=https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.7.0-amd64-netinst.iso
-         - ISO_URL=https://cdimage.debian.org/mirror/cdimage/archive/10.7.0/amd64/iso-cd/debian-10.7.0-amd64-netinst.iso
+         - ISO_CHECKSUM=file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA512SUMS
+           #- ISO_CHECKSUM=file:https://cdimage.debian.org/mirror/cdimage/archive/10.7.0/amd64/iso-cd/SHA512SUMS
+         - ISO_URL=https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.7.0-amd64-netinst.iso
+           #- ISO_URL=https://cdimage.debian.org/mirror/cdimage/archive/10.7.0/amd64/iso-cd/debian-10.7.0-amd64-netinst.iso
       volumes:
          - "./image/assets:/packer"
          - "./image/cache:/packer-cache"
diff --git a/image/assets/hcl/source-debian.pkr.hcl b/image/assets/hcl/source-debian.pkr.hcl
index e31f241..2f70fe1 100644
--- a/image/assets/hcl/source-debian.pkr.hcl
+++ b/image/assets/hcl/source-debian.pkr.hcl
@@ -44,5 +44,5 @@ source "qemu" "debian" {
   ssh_password       = "${var.ssh_password}"
   ssh_username       = "${var.ssh_username}"
   ssh_wait_timeout   = "900m"
-  vm_name            = "debian_packer.qcow2"
+  vm_name            = "debian-${var.image_version}_packer.qcow2"
 }
diff --git a/image/assets/hcl/variable.pkr.hcl b/image/assets/hcl/variable.pkr.hcl
index 3c24852..ac943c3 100644
--- a/image/assets/hcl/variable.pkr.hcl
+++ b/image/assets/hcl/variable.pkr.hcl
@@ -27,3 +27,8 @@ variable "ssh_username" {
   type    = string
   default = ""
 }
+
+variable "image_version" {
+  type    = string
+  default = "latest"
+}
diff --git a/image/assets/run-packer.sh b/image/assets/run-packer.sh
index e4137f6..8609fe2 100755
--- a/image/assets/run-packer.sh
+++ b/image/assets/run-packer.sh
@@ -10,10 +10,11 @@ SSH_PUB=$(cat ./id_rsa_qemu.pub)
 export PACKER_LOG=1; packer build --only="$SOURCE_NAME" \
 	-var ssh_username="$SSH_LIVE_USERNAME" \
 	-var ssh_password="$SSH_LIVE_PASSWORD" \
-	-var ansible_extra_vars="$ANSIBLE_EXTRA_VARS ssh_pub='$SSH_PUB'" \
+	-var ansible_extra_vars="$ANSIBLE_EXTRA_VARS ssh_pub='$SSH_PUB' image_version='$IMAGE_VERSION'" \
 	-var ansible_provisioning_playbook="$ANSIBLE_PLAYBOOK" \
 	-var iso_checksum="$ISO_CHECKSUM" \
 	-var iso_url="$ISO_URL" \
+	-var image_version="$IMAGE_VERSION" \
 	-on-error="ask" \
 	-force \
 	/packer/hcl/