This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/training.git
The following commit(s) were added to refs/heads/develop by this push:
new d1d4a17 missed some files
d1d4a17 is described below
commit d1d4a17ec215f038e3993d8c653ae28307479db2
Author: Justin Mclean <[email protected]>
AuthorDate: Fri Nov 14 14:10:14 2025 +1100
missed some files
---
.../Incubator/NeutralityInPractice/Dockerfile | 81 ++++++++++++++++++++++
.../NeutralityInPractice/docker-compose.yaml | 31 +++++++++
.../NeutralityInPractice/install-deps-centos.sh | 61 ++++++++++++++++
.../NeutralityInPractice/install-deps-mac.sh | 52 ++++++++++++++
4 files changed, 225 insertions(+)
diff --git a/content/Apache/Incubator/NeutralityInPractice/Dockerfile
b/content/Apache/Incubator/NeutralityInPractice/Dockerfile
new file mode 100644
index 0000000..95f8d06
--- /dev/null
+++ b/content/Apache/Incubator/NeutralityInPractice/Dockerfile
@@ -0,0 +1,81 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##########################################################################################
+# Build Apache Training
+##########################################################################################
+
+# Fixed version of this in order to have a fixed JDK version
+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 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==57.5.0 seqdiag blockdiag
actdiag nwdiag convert racks opc-diag pillow==9.5.0
+
+#ENV CONDA_DIR /opt/conda
+#RUN wget
https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-aarch64.sh -O
/root/miniconda.sh
+#RUN sh /root/miniconda.sh -b -p $CONDA_DIR
+#ENV PATH=$CONDA_DIR/bin:$PATH
+#RUN conda update -y conda
+#RUN rm /root/miniconda.sh
+#RUN wget --quiet
https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh
-O /root/miniconda.sh && sh /root/miniconda.sh -b -p /opt/conda
+#ENV PATH=$CONDA_DIR/bin:$PATH
+
+# Install vg2svg for rendering vega diagrams
+# NOTE: Installing vega-cli doesn't seem to work as dependencies are not
available for arm64 (silicon)
+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 apt install -y golang
+ENV PATH=/root/go/bin:$PATH
+RUN go install github.com/kaishuu0123/[email protected]
+
+# Install Syntrax
+# https://kevinpt.github.io/syntrax/
+# Problem is, that newer versions of python don't have use_2to3
+#RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
python3-gi-cairo gir1.2-gtk-4.0
+RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
gir1.2-gtk-4.0
+RUN python3 -m pip install --upgrade pycairo pango syntrax
+# For some reason, if we install this before the python stuff, it doesn't work
+RUN apt install -y python3-gi-cairo
+
+# Install Mermaid
+# Mermaid seems to have issues with Apple Silicon
+#RUN apt install -y nodejs npm
+RUN npm install -g @mermaid-js/mermaid-cli
+
+# Required for running on Windows systems
+RUN apt install -y dos2unix
+
+# Change the working directory (where commands are executed) into the new "ws"
directory
+WORKDIR /ws
\ No newline at end of file
diff --git a/content/Apache/Incubator/NeutralityInPractice/docker-compose.yaml
b/content/Apache/Incubator/NeutralityInPractice/docker-compose.yaml
new file mode 100644
index 0000000..c33a0a3
--- /dev/null
+++ b/content/Apache/Incubator/NeutralityInPractice/docker-compose.yaml
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: "3.8"
+services:
+ builder:
+ build:
+ context: .
+ dockerfile: Dockerfile
+ command: ["/ws/mvnw", "-e", "-Dmaven.repo.local=/ws/out/.repository",
"clean", "install"]
+ volumes:
+ # Bind the local directory as "/ws"
+ - type: bind
+ source: .
+ target: /ws
diff --git
a/content/Apache/Incubator/NeutralityInPractice/install-deps-centos.sh
b/content/Apache/Incubator/NeutralityInPractice/install-deps-centos.sh
new file mode 100644
index 0000000..b83d36d
--- /dev/null
+++ b/content/Apache/Incubator/NeutralityInPractice/install-deps-centos.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+
+############# install necessary packages
+yum install -y git graphviz maven nodejs wget bzip2 python36 python36-pip
pygobject3 cargo
+
+#############
+python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert syntrax racks opc-diag
+npm install vega pango
+
+############# install stack
+wget -qO- https://get.haskellstack.org/ | sh
+
+############# install PhantomJS
+wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+bunzip2 phantomjs-2.1.1-linux-x86_64.tar.bz2
+tar -xvf phantomjs-2.1.1-linux-x86_64.tar
+
+############# install ERD
+cd libs
+mkdir third-party
+cd third-party
+git clone https://github.com/BurntSushi/erd.git
+cd erd
+stack install
+read -p "Add stack ($HOME/.local/bin) to PATH ($PATH) ? (y/n)" -n 1 -r YES_NO
+if [ $YES_NO = "y" ]; then
+ echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bash_profile
+ . ~/.bash_profile
+fi
+
+############# install SVGBob
+cargo install svgbob_cli
+read -p "Add cargo ($HOME/.cargo/bin) to PATH ($PATH) ? (y/n)" -n 1 -r YES_NO
+if [ $YES_NO = "y" ]; then
+ echo 'export PATH=$PATH:$HOME/.cargo/bin' >> ~/.bash_profile
+ . ~/.bash_profile
+fi
+
+#############
+cd ../../..
+mvn jetty:run-exploded
+
diff --git a/content/Apache/Incubator/NeutralityInPractice/install-deps-mac.sh
b/content/Apache/Incubator/NeutralityInPractice/install-deps-mac.sh
new file mode 100644
index 0000000..25d677a
--- /dev/null
+++ b/content/Apache/Incubator/NeutralityInPractice/install-deps-mac.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+cd libs
+mkdir third-party
+cd third-party
+
+# Install ERD
+git clone git://github.com/BurntSushi/erd
+cd erd
+stack init
+stack build --system-ghc
+cd ..
+
+# Install Mermaid
+npm install mermaid.cli
+
+# Install PhantomJS
+wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip
+unzip phantomjs-2.1.1-macosx.zip
+
+# SVGBob
+cargo install svgbob_cli --path ./svgbob
+
+# Syntrax
+pip install --upgrade syntrax
+pip install pycairo
+brew install pygobject3
+
+# Vega
+npm install vega
+
+# ImageMagic
+#wget
https://imagemagick.org/download/binaries/ImageMagick-x86_64-apple-darwin17.7.0.tar.gz
+#tar xvzf ImageMagick-x86_64-apple-darwin17.7.0.tar.gz
