From 8b282250e39187aa3691f80727835dcb26edb073 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Fri, 25 Mar 2022 08:49:37 -0300 Subject: [PATCH] Fixes in the `dev` images. - Now they install the current git code for KiCost Related to #169 --- tools/dev_image/Dockerfile | 8 +++++++- tools/dev_image_k6/Dockerfile | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/dev_image/Dockerfile b/tools/dev_image/Dockerfile index 18433211..9743ab03 100644 --- a/tools/dev_image/Dockerfile +++ b/tools/dev_image/Dockerfile @@ -2,6 +2,9 @@ FROM setsoft/kicad_debian:latest MAINTAINER Salvador E. Tropea LABEL Description="KiCad with KiBot and other automation scripts" +# KiCost release +# curl -s https://api.github.com/repos/hildogjr/KiCost/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ + RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \ apt-get update && \ apt-get -y install -t buster-backports make wget curl rar bzip2 librsvg2-bin && \ @@ -11,12 +14,15 @@ RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \ curl -s https://api.github.com/repos/INTI-CMNB/KiBoM/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ curl -s https://api.github.com/repos/INTI-CMNB/InteractiveHtmlBom/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ curl -s https://api.github.com/repos/INTI-CMNB/PcbDraw/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiCost/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ apt -y install --no-install-recommends ./*.deb && \ curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/master --output pp.zip && \ unzip pp.zip && \ pip3 install --no-compile KiBot-master/ && \ rm -rf KiBot-master pp.zip && \ + curl https://codeload.github.com/hildogjr/KiCost/zip/refs/heads/master --output pp.zip && \ + unzip pp.zip && \ + pip3 install KiCost-master/ && \ + rm -rf KiCost-master pp.zip && \ apt-get -y remove curl wget python3-pip unzip && \ apt-get -y autoremove && \ rm /*.deb && \ diff --git a/tools/dev_image_k6/Dockerfile b/tools/dev_image_k6/Dockerfile index 32355325..39398584 100644 --- a/tools/dev_image_k6/Dockerfile +++ b/tools/dev_image_k6/Dockerfile @@ -12,12 +12,15 @@ RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \ curl -s https://api.github.com/repos/INTI-CMNB/KiBoM/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ curl -s https://api.github.com/repos/INTI-CMNB/InteractiveHtmlBom/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ curl -s https://api.github.com/repos/INTI-CMNB/PcbDraw/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiCost/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ apt -y install --no-install-recommends ./*.deb && \ curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/master --output pp.zip && \ unzip pp.zip && \ pip3 install --no-compile KiBot-master/ && \ rm -rf KiBot-master pp.zip && \ + curl https://codeload.github.com/hildogjr/KiCost/zip/refs/heads/master --output pp.zip && \ + unzip pp.zip && \ + pip3 install KiCost-master/ && \ + rm -rf KiCost-master pp.zip && \ apt-get -y remove curl wget python3-pip unzip && \ apt-get -y autoremove && \ rm /*.deb && \