From 287d9c756dda6125d99d1492d7d6f9e4ce5c87b3 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Tue, 14 Jun 2022 15:04:37 -0300 Subject: [PATCH] Now KiCad Git filters is part of kicad_auto image - Simpler action dockerfiles - Also updated contact e-mail --- Dockerfile | 14 ++------------ Dockerfile_dk5 | 13 ++----------- Dockerfile_dk6 | 14 ++------------ Dockerfile_k5 | 13 ++----------- Dockerfile_k6 | 14 ++------------ tools/dev_image/Dockerfile | 2 +- tools/dev_image_k6/Dockerfile | 2 +- 7 files changed, 12 insertions(+), 60 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cd35cf4..e7cec491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,6 @@ FROM setsoft/kicad_auto:ki6 -LABEL AUTHOR Salvador E. Tropea -LABEL Description="export various files from KiCad projects" - -RUN apt-get update && \ - apt-get -y install -t bullseye-backports curl && \ - apt-get -y install make wget && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/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/* +LABEL AUTHOR Salvador E. Tropea +LABEL Description="Export various files from KiCad projects (KiCad 6)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/Dockerfile_dk5 b/Dockerfile_dk5 index 63c9b034..ea323fd6 100644 --- a/Dockerfile_dk5 +++ b/Dockerfile_dk5 @@ -1,15 +1,6 @@ FROM setsoft/kicad_auto:dev -LABEL AUTHOR Salvador E. Tropea -LABEL Description="export various files from KiCad projects" - -RUN apt-get update && \ - apt-get -y install -t buster-backports make wget curl && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/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/* +LABEL AUTHOR Salvador E. Tropea +LABEL Description="Export various files from KiCad projects (KiCad 5 + development)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/Dockerfile_dk6 b/Dockerfile_dk6 index 2bb623dd..22e34ed7 100644 --- a/Dockerfile_dk6 +++ b/Dockerfile_dk6 @@ -1,16 +1,6 @@ FROM setsoft/kicad_auto:dev_k6 -LABEL AUTHOR Salvador E. Tropea -LABEL Description="export various files from KiCad projects" - -RUN apt-get update && \ - apt-get -y install -t bullseye-backports curl && \ - apt-get -y install make wget && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/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/* +LABEL AUTHOR Salvador E. Tropea +LABEL Description="Export various files from KiCad projects (KiCad 6 + development)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/Dockerfile_k5 b/Dockerfile_k5 index 9db5ee4e..13fea60c 100644 --- a/Dockerfile_k5 +++ b/Dockerfile_k5 @@ -1,15 +1,6 @@ FROM setsoft/kicad_auto:latest -LABEL AUTHOR Salvador E. Tropea -LABEL Description="export various files from KiCad projects" - -RUN apt-get update && \ - apt-get -y install -t buster-backports make wget curl && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/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/* +LABEL AUTHOR Salvador E. Tropea +LABEL Description="Export various files from KiCad projects (KiCad 5)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/Dockerfile_k6 b/Dockerfile_k6 index 4cd35cf4..e7cec491 100644 --- a/Dockerfile_k6 +++ b/Dockerfile_k6 @@ -1,16 +1,6 @@ FROM setsoft/kicad_auto:ki6 -LABEL AUTHOR Salvador E. Tropea -LABEL Description="export various files from KiCad projects" - -RUN apt-get update && \ - apt-get -y install -t bullseye-backports curl && \ - apt-get -y install make wget && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/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/* +LABEL AUTHOR Salvador E. Tropea +LABEL Description="Export various files from KiCad projects (KiCad 6)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/tools/dev_image/Dockerfile b/tools/dev_image/Dockerfile index c31c6f39..da4978c5 100644 --- a/tools/dev_image/Dockerfile +++ b/tools/dev_image/Dockerfile @@ -1,5 +1,5 @@ FROM setsoft/kicad_auto:latest -MAINTAINER Salvador E. Tropea +MAINTAINER Salvador E. Tropea LABEL Description="KiCad 5 with KiBot and other automation scripts" RUN dpkg --remove kicost kibot && \ diff --git a/tools/dev_image_k6/Dockerfile b/tools/dev_image_k6/Dockerfile index c715fa5f..cc5d200e 100644 --- a/tools/dev_image_k6/Dockerfile +++ b/tools/dev_image_k6/Dockerfile @@ -1,5 +1,5 @@ FROM setsoft/kicad_auto:ki6 -MAINTAINER Salvador E. Tropea +MAINTAINER Salvador E. Tropea LABEL Description="KiCad 6 with KiBot and other automation scripts" RUN dpkg --remove kicost kibot && \