Added experimental meta data to the dev images

See INTI-CMNB/KiBot#527
INTI-CMNB · Dec 6, 2023 · 8d0f77d · 8d0f77d
1 parent 6c77283
commit 8d0f77d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/iteration.sh b/iteration.sh
@@ -0,0 +1 @@
+IT=2
diff --git a/ki5/Dockerfile b/ki5/Dockerfile
@@ -17,3 +17,12 @@ RUN     apt-get update  && \
 	apt-get -y autoremove && \
 	rm /*.deb && \
 	rm -rf /var/lib/apt/lists/* /var/cache/debconf/templates.dat-old /var/lib/dpkg/status-old
+
+ARG iteration
+ENV KIBOT_ITERATION=$iteration
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_ITERATION}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/ki5/build.sh b/ki5/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad5_auto:latest .
-IT=1
+. ../iteration.sh
+docker build -f Dockerfile --build-arg iteration=${IT} -t ghcr.io/inti-cmnb/kicad5_auto:latest .
 TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:latest kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:latest kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:latest cat /etc/debian_version | tr -d '\n'`

diff --git a/ki6/Dockerfile b/ki6/Dockerfile
@@ -19,3 +19,12 @@ RUN     apt-get update  && \
 	apt-get -y autoremove && \
 	rm /*.deb && \
 	rm -rf /var/lib/apt/lists/* /var/cache/debconf/templates.dat-old /var/lib/dpkg/status-old
+
+ARG iteration
+ENV KIBOT_ITERATION=$iteration
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_ITERATION}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/ki6/build.sh b/ki6/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad6_auto:latest .
-IT=1
+. ../iteration.sh
+docker build -f Dockerfile --build-arg iteration=${IT} -t ghcr.io/inti-cmnb/kicad6_auto:latest .
 TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:latest kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:latest kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:latest cat /etc/debian_version | tr -d '\n'`

diff --git a/ki7/Dockerfile b/ki7/Dockerfile
@@ -19,3 +19,12 @@ RUN     apt-get update  && \
 	apt-get -y autoremove && \
 	rm /*.deb && \
 	rm -rf /var/lib/apt/lists/* /var/cache/debconf/templates.dat-old /var/lib/dpkg/status-old
+
+ARG iteration
+ENV KIBOT_ITERATION=$iteration
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_ITERATION}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/ki7/build.sh b/ki7/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad7_auto:latest .
-IT=1
+. ../iteration.sh
+docker build -f Dockerfile --build-arg iteration=${IT} -t ghcr.io/inti-cmnb/kicad7_auto:latest .
 TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:latest kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:latest kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:latest cat /etc/debian_version | tr -d '\n'`