templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI/CD][Added] Experimental meta data to the dev images 

See #527
This commit is contained in:
Salvador E. Tropea 2023-12-06 12:31:10 -03:00
parent f343df8512
commit 89365a8d5d
12 changed files with 77 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/dev_image_k5/Dockerfile
View File

@ -23,3 +23,12 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install KiAuto-master/ && \ # pip3 install KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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

4
tools/dev_image_k5/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad5_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
HASH=`git log --pretty=format:%h -1 | tr -d '\n'` HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad5_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev 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:dev kicad_version.py` TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev kicad_version.py`
TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev cat /etc/debian_version | tr -d '\n'` TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev cat /etc/debian_version | tr -d '\n'`
docker tag ghcr.io/inti-cmnb/kicad5_auto:dev ghcr.io/inti-cmnb/kicad5_auto:dev_${TG1}-${HASH}_${TG2}_${TG3} docker tag ghcr.io/inti-cmnb/kicad5_auto:dev ghcr.io/inti-cmnb/kicad5_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}

12
tools/dev_image_k5f/Dockerfile
View File

@ -20,3 +20,15 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install KiAuto-master/ && \ # pip3 install KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
ENV KICAD_AUTO_FULL=1
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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 && \
echo -n _b >> /etc/kiauto_tag && \
blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag

4
tools/dev_image_k5f/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad5_auto_full:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
HASH=`git log --pretty=format:%h -1 | tr -d '\n'` HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad5_auto_full:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev 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_full:dev kicad_version.py` 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'` 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/kicad5_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"` TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`

9
tools/dev_image_k6/Dockerfile
View File

@ -22,3 +22,12 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install --break-system-packages KiAuto-master/ && \ # pip3 install --break-system-packages KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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

4
tools/dev_image_k6/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad6_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
HASH=`git log --pretty=format:%h -1 | tr -d '\n'` HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad6_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev 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:dev kicad_version.py` TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev kicad_version.py`
TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev cat /etc/debian_version | tr -d '\n'` TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev cat /etc/debian_version | tr -d '\n'`
docker tag ghcr.io/inti-cmnb/kicad6_auto:dev ghcr.io/inti-cmnb/kicad6_auto:dev_${TG1}-${HASH}_${TG2}_${TG3} docker tag ghcr.io/inti-cmnb/kicad6_auto:dev ghcr.io/inti-cmnb/kicad6_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}

12
tools/dev_image_k6f/Dockerfile
View File

@ -20,3 +20,15 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install --break-system-packages KiAuto-master/ && \ # pip3 install --break-system-packages KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
ENV KICAD_AUTO_FULL=1
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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 && \
echo -n _b >> /etc/kiauto_tag && \
blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag

4
tools/dev_image_k6f/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad6_auto_full:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
HASH=`git log --pretty=format:%h -1 | tr -d '\n'` HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad6_auto_full:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev 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_full:dev kicad_version.py` 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'` 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:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"` TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`

11
tools/dev_image_k7/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ghcr.io/inti-cmnb/kicad_auto:ki7 FROM ghcr.io/inti-cmnb/kicad_auto:ki7
MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar> MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar>
LABEL Description="KiCad 6 with KiBot and other automation scripts" LABEL Description="KiCad 7 with KiBot and other automation scripts"
RUN dpkg --remove kicost kibot && \ RUN dpkg --remove kicost kibot && \
apt-get update && \ apt-get update && \
@ -22,3 +22,12 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install --break-system-packages KiAuto-master/ && \ # pip3 install --break-system-packages KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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

4
tools/dev_image_k7/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad7_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
HASH=`git log --pretty=format:%h -1 | tr -d '\n'` HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad7_auto:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev 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:dev kicad_version.py` TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev kicad_version.py`
TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev cat /etc/debian_version | tr -d '\n'` TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev cat /etc/debian_version | tr -d '\n'`
docker tag ghcr.io/inti-cmnb/kicad7_auto:dev ghcr.io/inti-cmnb/kicad7_auto:dev_${TG1}-${HASH}_${TG2}_${TG3} docker tag ghcr.io/inti-cmnb/kicad7_auto:dev ghcr.io/inti-cmnb/kicad7_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}

14
tools/dev_image_k7f/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ghcr.io/inti-cmnb/kicad_auto_test:ki7 FROM ghcr.io/inti-cmnb/kicad_auto_test:ki7
MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar> MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar>
LABEL Description="KiCad 6 with KiBot and other automation scripts" LABEL Description="KiCad 7 with KiBot and other automation scripts"
RUN dpkg --remove kicost kibot && \ RUN dpkg --remove kicost kibot && \
apt-get update && \ apt-get update && \
@ -20,3 +20,15 @@ RUN dpkg --remove kicost kibot && \
# unzip pp.zip && \ # unzip pp.zip && \
# pip3 install --break-system-packages KiAuto-master/ && \ # pip3 install --break-system-packages KiAuto-master/ && \
# rm -rf KiAuto-master/ pp.zip && \ # rm -rf KiAuto-master/ pp.zip && \
ARG repo_hash
ENV KIBOT_REPO_HASH=$repo_hash
ENV KICAD_AUTO_FULL=1
RUN kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
echo -n -${KIBOT_REPO_HASH}_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 && \
echo -n _b >> /etc/kiauto_tag && \
blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag

4
tools/dev_image_k7f/build.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad7_auto_full:dev . export HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad7_auto_full:dev .
TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'` TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
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` 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'` 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:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"` TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`