From 60dad31568617889da01dbb56c4468b9648e7400 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Tue, 26 Mar 2024 12:49:55 -0300 Subject: [PATCH] [CI/CD] No git KiCost on KiCad 8 dev images For some bizarre reason fails to install, isn't really needed right now --- tools/dev_image_k8/Dockerfile | 9 ++------- tools/dev_image_k8f/Dockerfile | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/dev_image_k8/Dockerfile b/tools/dev_image_k8/Dockerfile index 1787851c4..74ba155ab 100644 --- a/tools/dev_image_k8/Dockerfile +++ b/tools/dev_image_k8/Dockerfile @@ -1,19 +1,14 @@ FROM ghcr.io/inti-cmnb/kicad_auto:ki8 MAINTAINER Salvador E. Tropea -LABEL Description="KiCad 7 with KiBot and other automation scripts" +LABEL Description="KiCad 8 with KiBot and other automation scripts (development)" -RUN dpkg --remove kicost kibot && \ +RUN dpkg --remove kibot && \ apt-get update && \ 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 --break-system-packages --no-compile KiBot-dev/ && \ rm -rf KiBot-dev pp.zip && \ - curl https://codeload.github.com/hildogjr/KiCost/zip/refs/heads/master --output pp.zip && \ - unzip pp.zip && \ - pip3 install --break-system-packages KiCost-master/ && \ - apt-get -y remove curl unzip python3-pip && \ - rm -rf KiCost-master pp.zip && \ rm -rf /var/lib/apt/lists/* # kidiff depends on KiAuto diff --git a/tools/dev_image_k8f/Dockerfile b/tools/dev_image_k8f/Dockerfile index dcc97b39c..14531f362 100644 --- a/tools/dev_image_k8f/Dockerfile +++ b/tools/dev_image_k8f/Dockerfile @@ -2,16 +2,12 @@ FROM ghcr.io/inti-cmnb/kicad_auto_test:ki8 MAINTAINER Salvador E. Tropea LABEL Description="KiCad 8 with KiBot and other automation scripts" -RUN dpkg --remove kicost kibot && \ +RUN dpkg --remove kibot && \ apt-get update && \ curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/dev --output pp.zip && \ unzip pp.zip && \ pip3 install --break-system-packages --no-compile KiBot-dev/ && \ rm -rf KiBot-dev pp.zip && \ - curl https://codeload.github.com/hildogjr/KiCost/zip/refs/heads/master --output pp.zip && \ - unzip pp.zip && \ - pip3 install --break-system-packages KiCost-master/ && \ - rm -rf KiCost-master pp.zip && \ rm -rf /var/lib/apt/lists/* # kidiff depends on KiAuto