diff --git a/README.md b/README.md index b5c5d704..e1fb0f9f 100644 --- a/README.md +++ b/README.md @@ -5378,6 +5378,7 @@ If you need to run the current development version of KiBot you can use the foll [ghcr.io/inti-cmnb/kicad5_auto:dev](https://github.com/INTI-CMNB/kicad_auto/pkgs/container/kicad5_auto) or [ghcr.io/inti-cmnb/kicad6_auto:dev](https://github.com/INTI-CMNB/kicad_auto/pkgs/container/kicad6_auto) ([setsoft/kicad_auto:dev](https://hub.docker.com/repository/docker/setsoft/kicad_auto)). +These images are based on the *full* (also named *test*) images. The most important images are: diff --git a/docs/README.in b/docs/README.in index ca4c7e77..6f03cbd9 100644 --- a/docs/README.in +++ b/docs/README.in @@ -1577,6 +1577,7 @@ If you need to run the current development version of KiBot you can use the foll [ghcr.io/inti-cmnb/kicad5_auto:dev](https://github.com/INTI-CMNB/kicad_auto/pkgs/container/kicad5_auto) or [ghcr.io/inti-cmnb/kicad6_auto:dev](https://github.com/INTI-CMNB/kicad_auto/pkgs/container/kicad6_auto) ([setsoft/kicad_auto:dev](https://hub.docker.com/repository/docker/setsoft/kicad_auto)). +These images are based on the *full* (also named *test*) images. The most important images are: diff --git a/tools/dev_image/Dockerfile b/tools/dev_image/Dockerfile index 2c2d9b99..d2187a2f 100644 --- a/tools/dev_image/Dockerfile +++ b/tools/dev_image/Dockerfile @@ -1,10 +1,9 @@ -FROM setsoft/kicad_auto:latest +FROM setsoft/kicad_auto_test:latest MAINTAINER Salvador E. Tropea LABEL Description="KiCad 5 with KiBot and other automation scripts" RUN dpkg --remove kicost kibot && \ apt-get update && \ - apt-get -y install --no-install-recommends python3-pip unzip curl python3-setuptools python3-wheel && \ curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/dev --output pp.zip && \ unzip pp.zip && \ pip3 install --no-compile KiBot-dev/ && \ @@ -13,11 +12,9 @@ RUN dpkg --remove kicost kibot && \ unzip pp.zip && \ pip3 install KiCost-master/ && \ rm -rf KiCost-master pp.zip && \ - apt-get -y remove curl python3-pip unzip python3-setuptools python3-wheel && \ + dpkg --remove kiauto && \ + curl https://codeload.github.com/INTI-CMNB/KiAuto/zip/refs/heads/master --output pp.zip && \ + unzip pp.zip && \ + pip3 install KiAuto-master/ && \ + rm -rf KiAuto-master/ pp.zip && \ rm -rf /var/lib/apt/lists/* - -# dpkg --remove kiauto && \ -# curl https://codeload.github.com/INTI-CMNB/KiAuto/zip/refs/heads/master --output pp.zip && \ -# unzip pp.zip && \ -# pip3 install KiAuto-master/ && \ -# rm -rf KiAuto-master/ pp.zip && \ diff --git a/tools/dev_image_k6/Dockerfile b/tools/dev_image_k6/Dockerfile index 5298d828..4b40c92e 100644 --- a/tools/dev_image_k6/Dockerfile +++ b/tools/dev_image_k6/Dockerfile @@ -1,10 +1,9 @@ -FROM setsoft/kicad_auto:ki6 +FROM setsoft/kicad_auto_test:ki6 MAINTAINER Salvador E. Tropea LABEL Description="KiCad 6 with KiBot and other automation scripts" RUN dpkg --remove kicost kibot && \ apt-get update && \ - apt-get -y install --no-install-recommends -t bullseye-backports python3-pip unzip curl python3-setuptools python3-wheel && \ curl https://codeload.github.com/INTI-CMNB/KiBot/zip/refs/heads/dev --output pp.zip && \ unzip pp.zip && \ pip3 install --no-compile KiBot-dev/ && \ @@ -13,12 +12,9 @@ RUN dpkg --remove kicost kibot && \ unzip pp.zip && \ pip3 install KiCost-master/ && \ rm -rf KiCost-master pp.zip && \ - apt-get -y remove curl python3-pip unzip python3-setuptools python3-wheel && \ + dpkg --remove kiauto && \ + curl https://codeload.github.com/INTI-CMNB/KiAuto/zip/refs/heads/master --output pp.zip && \ + unzip pp.zip && \ + pip3 install KiAuto-master/ && \ + rm -rf KiAuto-master/ pp.zip && \ rm -rf /var/lib/apt/lists/* - -# dpkg --remove kiauto && \ -# curl https://codeload.github.com/INTI-CMNB/KiAuto/zip/refs/heads/master --output pp.zip && \ -# unzip pp.zip && \ -# pip3 install KiAuto-master/ && \ -# rm -rf KiAuto-master/ pp.zip && \ -