From 6a6c06dc3341303385bcd75815c8320750c95251 Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Mon, 14 Aug 2023 13:12:34 -0300
Subject: [PATCH] [CI/CD] Adjusted dev images creation

- To Debian 12
---
 tools/dev_image_k5f/build.sh  | 2 +-
 tools/dev_image_k6/Dockerfile | 3 +--
 tools/dev_image_k6f/build.sh  | 2 +-
 tools/dev_image_k7/Dockerfile | 3 +--
 tools/dev_image_k7f/build.sh  | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tools/dev_image_k5f/build.sh b/tools/dev_image_k5f/build.sh
index e12d2ac1..fb0fcc33 100755
--- a/tools/dev_image_k5f/build.sh
+++ b/tools/dev_image_k5f/build.sh
@@ -5,7 +5,7 @@ TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kibot --version | se
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev cat /etc/debian_version | tr -d '\n'`
-TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:latest /bin/bash -c "ls -d /usr/bin/?.? | tr -d '\n' | tail -c 3"`
+TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`
 docker tag ghcr.io/inti-cmnb/kicad5_auto_full:dev ghcr.io/inti-cmnb/kicad5_auto_full:dev_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad5_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k5_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad5_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k5
diff --git a/tools/dev_image_k6/Dockerfile b/tools/dev_image_k6/Dockerfile
index aeff1540..98a7b408 100644
--- a/tools/dev_image_k6/Dockerfile
+++ b/tools/dev_image_k6/Dockerfile
@@ -4,8 +4,7 @@ LABEL Description="KiCad 6 with KiBot and other automation scripts"
 
 RUN     dpkg --remove kicost kibot && \
 	apt-get update && \
-	apt-get -y install --no-install-recommends -t bullseye-backports curl && \
-	apt-get -y install --no-install-recommends unzip python3-pip && \
+	apt-get -y install --no-install-recommends curl unzip python3-pip && \
 	curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/dev --output pp.zip && \
 	unzip pp.zip && \
 	pip3 install --no-compile KiBot-dev/ && \
diff --git a/tools/dev_image_k6f/build.sh b/tools/dev_image_k6f/build.sh
index 5214a180..6e92945a 100755
--- a/tools/dev_image_k6f/build.sh
+++ b/tools/dev_image_k6f/build.sh
@@ -5,7 +5,7 @@ TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kibot --version | se
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev cat /etc/debian_version | tr -d '\n'`
-TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:latest /bin/bash -c "ls -d /usr/bin/?.? | tr -d '\n' | tail -c 3"`
+TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`
 docker tag ghcr.io/inti-cmnb/kicad6_auto_full:dev ghcr.io/inti-cmnb/kicad6_auto_full:dev_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad6_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k6_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad6_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k6
diff --git a/tools/dev_image_k7/Dockerfile b/tools/dev_image_k7/Dockerfile
index 28c984b0..58afcdbd 100644
--- a/tools/dev_image_k7/Dockerfile
+++ b/tools/dev_image_k7/Dockerfile
@@ -4,8 +4,7 @@ LABEL Description="KiCad 6 with KiBot and other automation scripts"
 
 RUN     dpkg --remove kicost kibot && \
 	apt-get update && \
-	apt-get -y install --no-install-recommends -t bullseye-backports curl && \
-	apt-get -y install --no-install-recommends unzip python3-pip && \
+	apt-get -y install --no-install-recommends curl unzip python3-pip && \
 	curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/dev --output pp.zip && \
 	unzip pp.zip && \
 	pip3 install --no-compile KiBot-dev/ && \
diff --git a/tools/dev_image_k7f/build.sh b/tools/dev_image_k7f/build.sh
index d851a6fa..1529cdaa 100755
--- a/tools/dev_image_k7f/build.sh
+++ b/tools/dev_image_k7f/build.sh
@@ -5,7 +5,7 @@ TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kibot --version | se
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev cat /etc/debian_version | tr -d '\n'`
-TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:latest /bin/bash -c "ls -d /usr/bin/?.? | tr -d '\n' | tail -c 3"`
+TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`
 docker tag ghcr.io/inti-cmnb/kicad7_auto_full:dev ghcr.io/inti-cmnb/kicad7_auto_full:dev_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad7_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k7_${TG1}-${HASH}_${TG2}_${TG3}_${TG4}
 docker tag ghcr.io/inti-cmnb/kicad7_auto_full:dev ghcr.io/inti-cmnb/kicad_auto_full:dev_k7