From a3c776765e95739a525e4406c1566d45d22e3915 Mon Sep 17 00:00:00 2001
From: Marco Massarelli <marco.massarelli@gmail.com>
Date: Thu, 23 Nov 2023 20:22:27 +0000
Subject: [PATCH] Add Ergogen and Freerouting (cli and stable)

---
 build.sh         |  3 ++-
 kibot/Dockerfile | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 3340dc7..0999a76 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ plates="backplate frontplate controller_overlay"
 # Define the KiCad Auto Docker image to use
 # kicad_auto_immge=ghcr.io/inti-cmnb/kicad7_auto:latest
 kicad_auto_image=ceoloide/kicad_auto:nightly
+freerouting_cli=ceoloide/kicad_auto:nightly
 
 # Preserve manually routed files
 if [ -e ergogen/output/pcbs/*_manually_routed.kicad_pcb ]; then
@@ -69,7 +70,7 @@ do
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.8.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.9.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/${board}.rules -mp 20 -dct 1
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-test.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
-        ${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
+        ${container_cmd} run ${container_args} ${freerouting_cli_image} java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
         # ${container_cmd} run ${container_args} nixos/nix nix-shell --argstr board ${board}
     fi
     if [ -e ergogen/output/pcbs/${board}.ses ]; then
diff --git a/kibot/Dockerfile b/kibot/Dockerfile
index 5168bd6..4a23d62 100644
--- a/kibot/Dockerfile
+++ b/kibot/Dockerfile
@@ -15,8 +15,14 @@ RUN     apt-get update  && \
 	wget https://github.com/INTI-CMNB/KiDiff/releases/download/v2.4.7/kidiff_2.4.7-1_all.deb && \
 	wget https://github.com/INTI-CMNB/KiBot/releases/download/v1.6.3/kibot_1.6.3-1_all.deb && \
 	apt -y install --no-install-recommends ./*.deb && \
-	sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<!-- <policy domain="coder" rights="none" pattern="PDF" \/> -->/g' /etc/ImageMagick-6/policy.xml && \
-	sed -i 's/<policy domain="coder" rights="none" pattern="PS" \/>/<!-- <policy domain="coder" rights="none" pattern="PS" \/> -->/g' /etc/ImageMagick-6/policy.xml && \
+	apt -y install --no-install-recommends nodejs npm xvfb && \
+	npm install -g https://github.com/ergogen/ergogen#develop && \
+	apt -y install openjdk-17-jre && \
+	wget http://www.repo.hu/projects/freerouting_cli/releases-jar/freerouting_cli-1.tar.gz && \
+  tar xvf freerouting_cli-1.tar.gz && \
+	cp /freerouting_cli/lib/freerouting_cli.jar /opt/freerouting_cli.jar && \
+	wget https://github.com/freerouting/freerouting/releases/download/v1.9.0/freerouting-1.9.0.jar && \
+	mv freerouting-1.9.0.jar /opt/freerouting-1.9.0.jar && \
 	apt-get -y remove wget && \
 	apt-get -y autoremove && \
 	rm /*.deb && \