From c27fe76a9dbb5653abbb4e26023c1348b4f61932 Mon Sep 17 00:00:00 2001 From: SET Date: Thu, 20 Aug 2020 16:13:29 -0300 Subject: [PATCH] Updated to KiBot 0.6.1. Also refactorized the Dockerfile to use smaller layers. --- Dockerfile | 40 ++++++++++++++++++++++++++++++++++++---- README.md | 2 +- download.sh | 9 +++++---- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84100a7..63777e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,44 @@ FROM setsoft/kicad_debian:latest MAINTAINER Salvador E. Tropea -LABEL Description="KiCad with KiPlot and other automation scripts" +LABEL Description="KiCad with KiBot and other automation scripts" -COPY *.deb / +COPY kicad-automation-scripts*.deb / RUN apt-get update && \ - apt-get -y install --no-install-recommends make && \ - apt -y install --no-install-recommends ./*.deb && \ + apt -y install --no-install-recommends ./kicad-automation-scripts*.deb && \ apt-get -y autoremove && \ rm /*.deb && \ rm -rf /var/lib/apt/lists/* +COPY kibom*.deb / +RUN apt-get update && \ + apt -y install --no-install-recommends ./kibom*.deb && \ + apt-get -y autoremove && \ + rm /*.deb && \ + rm -rf /var/lib/apt/lists/* + +COPY interactivehtmlbom*.deb / +RUN apt-get update && \ + apt -y install --no-install-recommends ./interactivehtmlbom*.deb && \ + apt-get -y autoremove && \ + rm /*.deb && \ + rm -rf /var/lib/apt/lists/* + +COPY pcbdraw*.deb *pybars*.deb *pymeta*.deb / +RUN apt-get update && \ + apt -y install --no-install-recommends ./pcbdraw*.deb ./*pybars*.deb ./*pymeta*.deb && \ + apt-get -y autoremove && \ + rm /*.deb && \ + rm -rf /var/lib/apt/lists/* + +COPY kibot*.deb / +RUN apt-get update && \ + apt -y install ./kibot*.deb && \ + apt-get -y autoremove && \ + rm /*.deb && \ + rm -rf /var/lib/apt/lists/* + +RUN apt-get update && \ + apt-get -y install --no-install-recommends make && \ + apt-get -y autoremove && \ + rm -rf /var/lib/apt/lists/* + diff --git a/README.md b/README.md index b23631a..ed5a6e4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This image is based on [setsoft/kicad_debian](https://github.com/INTI-CMNB/kicad The available tags are: * **10.3-5.1.5** is KiCad 5.1.5 on Debian 10.3 with Kiplot 0.2.4, kicad-automation-scripts 1.3.1, KiBoM 1.6.3 and interactivehtmlbom 2.3.1 -* **10.3-5.1.6** (same as **latest**) is KiCad 5.1.6 on Debian 10.4 with Kiplot 0.4.0, kicad-automation-scripts 1.4.1, KiBoM 1.8.0, interactivehtmlbom 2.3.3 and PcbDraw 0.5.0 +* **10.4-5.1.6** (same as **latest**) is KiCad 5.1.6 on Debian 10.4 with KiBot 0.6.1, kicad-automation-scripts 1.4.1, KiBoM 1.8.0, interactivehtmlbom 2.3.3 and PcbDraw 0.5.0 You can run it using a script like this: diff --git a/download.sh b/download.sh index 992aa75..5b8163e 100755 --- a/download.sh +++ b/download.sh @@ -1,9 +1,10 @@ #!/bin/sh rm *.deb -curl -s https://api.github.com/repos/set-soft/mcpy/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - -curl -s https://api.github.com/repos/set-soft/macropy/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - +#curl -s https://api.github.com/repos/set-soft/mcpy/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - +#curl -s https://api.github.com/repos/set-soft/macropy/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/kicad-automation-scripts/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/kiplot/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/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/KiBot/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - +