From 8d8b6b07e6b9555acb2ebc8b11990dbf471b88cb Mon Sep 17 00:00:00 2001 From: andre Date: Sat, 4 Sep 2021 21:14:37 +0200 Subject: [PATCH 1/3] installing mqtt broker, clients and library from dedicated ppa --- WolframBased/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WolframBased/Dockerfile b/WolframBased/Dockerfile index 2f70c5f..ac172c4 100644 --- a/WolframBased/Dockerfile +++ b/WolframBased/Dockerfile @@ -4,4 +4,8 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt upgrade -yy && DEBIAN_FRONT RUN apt update && apt install wget && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" && apt update && apt install -y cmake clang-11 clang-tidy-11 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && apt update && apt install gh RUN raco pkg install --deps search-auto threading || true +# K: installing mqtt broker, clients and library from dedicated ppa +RUN apt-add-repository ppa:mosquitto-dev/mosquitto-ppa -y +RUN apt update +RUN apt install mosquitto mosquitto-clients libmosquitto-dev -y CMD /bin/bash From 6f1e25c354ca367f4797265537b7f2d38bfe6b6f Mon Sep 17 00:00:00 2001 From: andre Date: Tue, 7 Sep 2021 10:54:28 +0200 Subject: [PATCH 2/3] added MqttWolframBased folder and Dockerfile. Reverted WolframBased Dockerfile to its previous version. --- MqttWolframBased/Dockerfile | 11 +++++++++++ WolframBased/Dockerfile | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 MqttWolframBased/Dockerfile diff --git a/MqttWolframBased/Dockerfile b/MqttWolframBased/Dockerfile new file mode 100644 index 0000000..ac172c4 --- /dev/null +++ b/MqttWolframBased/Dockerfile @@ -0,0 +1,11 @@ +FROM wolframresearch/wolframengine:latest +USER root +RUN apt update && DEBIAN_FRONTEND=noninteractive apt upgrade -yy && DEBIAN_FRONTEND=noninteractive apt install -yy racket apport expect lldb strace clang-format clang-tidy swig clang cmake curl git uuid-dev software-properties-common emacs-nox && DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:git-core/ppa && DEBIAN_FRONTEND=noninteractive apt update -yy && DEBIAN_FRONTEND=noninteractive apt install -yy git +RUN apt update && apt install wget && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" && apt update && apt install -y cmake clang-11 clang-tidy-11 +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && apt update && apt install gh +RUN raco pkg install --deps search-auto threading || true +# K: installing mqtt broker, clients and library from dedicated ppa +RUN apt-add-repository ppa:mosquitto-dev/mosquitto-ppa -y +RUN apt update +RUN apt install mosquitto mosquitto-clients libmosquitto-dev -y +CMD /bin/bash diff --git a/WolframBased/Dockerfile b/WolframBased/Dockerfile index ac172c4..2f70c5f 100644 --- a/WolframBased/Dockerfile +++ b/WolframBased/Dockerfile @@ -4,8 +4,4 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt upgrade -yy && DEBIAN_FRONT RUN apt update && apt install wget && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" && apt update && apt install -y cmake clang-11 clang-tidy-11 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && apt update && apt install gh RUN raco pkg install --deps search-auto threading || true -# K: installing mqtt broker, clients and library from dedicated ppa -RUN apt-add-repository ppa:mosquitto-dev/mosquitto-ppa -y -RUN apt update -RUN apt install mosquitto mosquitto-clients libmosquitto-dev -y CMD /bin/bash From 8a5c271a2eeee4aa68baf2b521161e9749ea4004 Mon Sep 17 00:00:00 2001 From: andre Date: Tue, 7 Sep 2021 14:31:07 +0200 Subject: [PATCH 3/3] MqttWolframBased added to github workflow --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index fa551c1..5744d56 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,7 +19,7 @@ jobs: custom-images: strategy: matrix: - build-type: [UbuntuBased, WolframBased, Frog, Latex] + build-type: [UbuntuBased, WolframBased, Frog, Latex, MqttWolframBased] runs-on: ubuntu-latest if: github.event_name == 'push'