From 258fe50243379c2ab6796a35067cee2bae0889f9 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Tue, 6 Oct 2020 17:55:23 -0300 Subject: [PATCH] Removed the download script. --- Dockerfile | 45 ++++++++------------------------------------- Dockerfile-nightly | 45 ++++++++------------------------------------- Makefile | 7 ++----- download.sh | 10 ---------- 4 files changed, 18 insertions(+), 89 deletions(-) delete mode 100755 download.sh diff --git a/Dockerfile b/Dockerfile index c0d882a..e147488 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,44 +2,15 @@ FROM setsoft/kicad_debian:latest MAINTAINER Salvador E. Tropea LABEL Description="KiCad with KiBot and other automation scripts" -COPY kicad-automation-scripts*.deb / RUN apt-get update && \ - apt -y install --no-install-recommends ./kicad-automation-scripts*.deb && \ + apt-get -y install make wget curl && \ + curl -s https://api.github.com/repos/INTI-CMNB/KiAuto/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 - && \ + apt -y install --no-install-recommends ./*.deb && \ + apt-get -y remove curl wget && \ 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-get -y install --no-install-recommends imagemagick librsvg2-bin && \ - 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/Dockerfile-nightly b/Dockerfile-nightly index 726bd63..69b2d53 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -2,44 +2,15 @@ FROM setsoft/kicad_debian:nightly MAINTAINER Salvador E. Tropea LABEL Description="KiCad with KiBot and other automation scripts" -COPY kicad-automation-scripts*.deb / RUN apt-get update && \ - apt -y install --no-install-recommends ./kicad-automation-scripts*.deb && \ + apt-get -y install make wget curl && \ + curl -s https://api.github.com/repos/INTI-CMNB/KiAuto/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 - && \ + apt -y install --no-install-recommends ./*.deb && \ + apt-get -y remove curl wget && \ 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-get -y install --no-install-recommends imagemagick librsvg2-bin && \ - 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/Makefile b/Makefile index 7a9a40e..6b5ef76 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make tagname = 10.4-5.1.6 tagname_rc = 10.4-5.1.6rc -tagname_ng = bullseye-5.99-20200922 +tagname_ng = bullseye-5.99-20201002 docker_user = setsoft docker_img = setsoft/kicad_auto @@ -9,10 +9,7 @@ CWD := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))) USER_ID=$(shell id -u) GROUP_ID=$(shell id -g) -download_packages: - ./download.sh - -build: download_packages +build: docker build -f Dockerfile -t $(docker_img):$(tagname) . docker build -f Dockerfile -t $(docker_img):latest . diff --git a/download.sh b/download.sh deleted file mode 100755 index 5b8163e..0000000 --- a/download.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/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/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 - -