This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new 0eee679 feat: Some added tool installations to make most of the
diagrams work.
0eee679 is described below
commit 0eee6791f27d9f8684cac5dac37161ca8bfcefd5
Author: Christofer Dutz <[email protected]>
AuthorDate: Mon Sep 16 23:25:35 2024 +0200
feat: Some added tool installations to make most of the diagrams work.
---
Dockerfile | 32 +++++++++++++++++-----
.../main/resources/archetype-resources/Dockerfile | 32 +++++++++++++++++-----
2 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 94cc9b3..93938bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,13 +22,31 @@ FROM azul/zulu-openjdk:21 as build
# Install some stuff we need to run the build
RUN apt update -y
-RUN apt install -y maven git graphviz nodejs npm wget bzip2 python3
python3-pip cargo
-RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag
-#RUN npm install vega pango
-RUN wget -qO- https://get.haskellstack.org/ | sh
-RUN wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
-RUN bunzip2 phantomjs-2.1.1-linux-x86_64.tar.bz2
-RUN tar -xvf phantomjs-2.1.1-linux-x86_64.tar
+RUN apt install -y git graphviz wget bzip2 python3 python3-pip imagemagick
curl protobuf-compiler mc
+
+# Install the version 1.76.0 of the Rust toolchain
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
--default-toolchain=1.76.0
+ENV PATH="/root/.cargo/bin:$PATH"
+# Install svgbob
+RUN cargo install svgbob_cli
+RUN cp /root/.cargo/bin/svgbob_cli /usr/local/bin
+
+# Forced version of pillow as with version 10 the build fails
+RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag pillow==9.5.0
+
+# Install vg2svg for rendering vega diagrams
+#ENV NODE_VERSION=18.20.4
+#RUN curl --silent -o-
https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+#RUN /root/.nvm/install.sh
+#ENV PATH=/root/.nvm/versions/node/v$NODE_VERSION/bin:$PATH
+#RUN npm install --no-audit vega
+
+#RUN wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+#RUN bunzip2 phantomjs-2.1.1-linux-x86_64.tar.bz2
+#RUN tar -xvf phantomjs-2.1.1-linux-x86_64.tar
+
+# Install ERD
+#RUN cabal v2-update && cabal v2-install erd
# Required for running on Windows systems
RUN apt install -y dos2unix
diff --git
a/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
b/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
index d302de6..93938bd 100644
--- a/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
+++ b/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
@@ -22,13 +22,31 @@ FROM azul/zulu-openjdk:21 as build
# Install some stuff we need to run the build
RUN apt update -y
-RUN apt install -y git graphviz nodejs npm wget bzip2 python3 python3-pip cargo
-RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag
-#RUN npm install vega pango
-RUN wget -qO- https://get.haskellstack.org/ | sh
-RUN wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
-RUN bunzip2 phantomjs-2.1.1-linux-x86_64.tar.bz2
-RUN tar -xvf phantomjs-2.1.1-linux-x86_64.tar
+RUN apt install -y git graphviz wget bzip2 python3 python3-pip imagemagick
curl protobuf-compiler mc
+
+# Install the version 1.76.0 of the Rust toolchain
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
--default-toolchain=1.76.0
+ENV PATH="/root/.cargo/bin:$PATH"
+# Install svgbob
+RUN cargo install svgbob_cli
+RUN cp /root/.cargo/bin/svgbob_cli /usr/local/bin
+
+# Forced version of pillow as with version 10 the build fails
+RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag pillow==9.5.0
+
+# Install vg2svg for rendering vega diagrams
+#ENV NODE_VERSION=18.20.4
+#RUN curl --silent -o-
https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+#RUN /root/.nvm/install.sh
+#ENV PATH=/root/.nvm/versions/node/v$NODE_VERSION/bin:$PATH
+#RUN npm install --no-audit vega
+
+#RUN wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+#RUN bunzip2 phantomjs-2.1.1-linux-x86_64.tar.bz2
+#RUN tar -xvf phantomjs-2.1.1-linux-x86_64.tar
+
+# Install ERD
+#RUN cabal v2-update && cabal v2-install erd
# Required for running on Windows systems
RUN apt install -y dos2unix
