From 433b939cddc74a26dbccfe92a1cf1cdd3870cf7b Mon Sep 17 00:00:00 2001 From: SimplisticCode <42718252+SimplisticCode@users.noreply.github.com> Date: Wed, 28 Sep 2022 17:23:22 -0700 Subject: [PATCH 1/6] Update Dockerfile --- Dockerfile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71f6d8f..0f0c7fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ # Base -FROM ubuntu:21.04 as base +FROM ubuntu:22.04 as base ARG DEBIAN_FRONTEND=noninteractive RUN mkdir /tools WORKDIR / RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y wget git python pip \ +RUN apt-get install -y wget git python3 pip \ python3-dev software-properties-common \ iproute2 usbutils srecord \ build-essential clang bison flex \ @@ -23,7 +23,8 @@ RUN apt-get install -y wget git python pip \ libftdi1-2 libftdi1-dev libhidapi-libusb0 libhidapi-dev libudev-dev make g++ \ libc++-dev libc++abi-dev nodejs python2 npm \ iverilog verilator \ - vim mercurial libboost-program-options-dev + vim mercurial libboost-program-options-dev \ + texlive-full # Builder FROM base as builder @@ -282,6 +283,17 @@ RUN cd /tools/${TOOL}/source/lobot/ && cabal v2-build ENV PATH="/tools/${TOOL}:${PATH}" RUN echo "${TOOL} ${REPO} ${TAG}" >> ${VERSION_LOG} + +# DocumentationEnricher +# ARG TOOL=DER +# ARG TAG=1.0.0 +# ARG REPO=https://github.com/SimplisticCode/DER +# RUN git clone ${REPO} /tools/${TOOL} +# WORKDIR /tools/${TOOL} +# RUN ./build.sh -r +# ENV PATH="/tools/${TOOL}:${PATH}" +# RUN echo "${TOOL} ${REPO} ${TAG}" >> ${VERSION_LOG} + # Runner FROM base as runner COPY --from=builder /opt/ /opt/ From bad62c0f0477fd24d84098d99ec9ce6e82239c5d Mon Sep 17 00:00:00 2001 From: Simon Hansen Date: Thu, 6 Oct 2022 09:09:24 -0700 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92d4531..2ff66bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base -FROM ubuntu:22.04 as base +FROM ubuntu:21.04 as base ARG DEBIAN_FRONTEND=noninteractive RUN mkdir /tools WORKDIR / From c5c0e324a4bf9f47559c2a2185d5ac5b454ce6f7 Mon Sep 17 00:00:00 2001 From: Simon Hansen Date: Thu, 6 Oct 2022 09:46:16 -0700 Subject: [PATCH 3/6] Removed bad character --- specs/Lando/RTS.lando | 4 ++-- specs/SysML/HARDENS.sysml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/Lando/RTS.lando b/specs/Lando/RTS.lando index e8dd331..3f0d06a 100644 --- a/specs/Lando/RTS.lando +++ b/specs/Lando/RTS.lando @@ -9,8 +9,8 @@ The overall shape of the Reactor Trip System (RTS) is an archetypal subsystem. They are read by the `Instrumentation` subsystem, which contains four separate and independent `Instrumentation` components. The "Compute" part of the architecture is spread across -the `Actuation Logic` subsystem—which contains the two `Voting` -components which perform the actuation logic itself—and the `Root` +the `Actuation Logic` subsystem, which contains the two `Voting` +components which perform the actuation logic itself, and the `Root` subsystem which contains the core computation and I/O components, and the two separate and independent devices that drive actuators. diff --git a/specs/SysML/HARDENS.sysml b/specs/SysML/HARDENS.sysml index 4190841..fd1e1c3 100644 --- a/specs/SysML/HARDENS.sysml +++ b/specs/SysML/HARDENS.sysml @@ -11,8 +11,8 @@ * subsystem. They are read by the `Instrumentation` subsystem, which * contains four separate and independent `Instrumentation` * components. The "Compute" part of the architecture is spread across - * the `Actuation Logic` subsystem—which contains the two `Voting` - * components which perform the actuation logic itself—and the `Root` + * the `Actuation Logic` subsystem, which contains the two `Voting` + * components which perform the actuation logic itself, and the `Root` * subsystem which contains the core computation and I/O components, and * the two separate and independent devices that drive actuators. */ From 96accf8e2070f46819009ac3cc29398c998dee71 Mon Sep 17 00:00:00 2001 From: Simon Hansen Date: Thu, 6 Oct 2022 11:04:34 -0700 Subject: [PATCH 4/6] Revert "Removed bad character" This reverts commit c5c0e324a4bf9f47559c2a2185d5ac5b454ce6f7. --- specs/Lando/RTS.lando | 4 ++-- specs/SysML/HARDENS.sysml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/Lando/RTS.lando b/specs/Lando/RTS.lando index 3f0d06a..e8dd331 100644 --- a/specs/Lando/RTS.lando +++ b/specs/Lando/RTS.lando @@ -9,8 +9,8 @@ The overall shape of the Reactor Trip System (RTS) is an archetypal subsystem. They are read by the `Instrumentation` subsystem, which contains four separate and independent `Instrumentation` components. The "Compute" part of the architecture is spread across -the `Actuation Logic` subsystem, which contains the two `Voting` -components which perform the actuation logic itself, and the `Root` +the `Actuation Logic` subsystem—which contains the two `Voting` +components which perform the actuation logic itself—and the `Root` subsystem which contains the core computation and I/O components, and the two separate and independent devices that drive actuators. diff --git a/specs/SysML/HARDENS.sysml b/specs/SysML/HARDENS.sysml index fd1e1c3..4190841 100644 --- a/specs/SysML/HARDENS.sysml +++ b/specs/SysML/HARDENS.sysml @@ -11,8 +11,8 @@ * subsystem. They are read by the `Instrumentation` subsystem, which * contains four separate and independent `Instrumentation` * components. The "Compute" part of the architecture is spread across - * the `Actuation Logic` subsystem, which contains the two `Voting` - * components which perform the actuation logic itself, and the `Root` + * the `Actuation Logic` subsystem—which contains the two `Voting` + * components which perform the actuation logic itself—and the `Root` * subsystem which contains the core computation and I/O components, and * the two separate and independent devices that drive actuators. */ From 1aa0c2602319bdff2818d0919c0ef2cacb3ec245 Mon Sep 17 00:00:00 2001 From: Simon Hansen <42718252+SimplisticCode@users.noreply.github.com> Date: Wed, 2 Nov 2022 09:51:48 -0700 Subject: [PATCH 5/6] Updated docker image --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ff66bd..f45c37c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -285,13 +285,13 @@ RUN echo "${TOOL} ${REPO} ${TAG}" >> ${VERSION_LOG} # DocumentationEnricher ARG TOOL=der -ARG TAG=0.1.4 -ARG REPO=https://github.com/SimplisticCode/DER/releases/download/v1.1.4/ +ARG TAG=0.1.5 +ARG REPO=https://github.com/GaloisInc/RDE_RF/ WORKDIR /tmp -RUN wget ${REPO}/${TOOL}-${TAG}.zip +RUN wget ${REPO}/releases/download/v.${TAG}/${TOOL}-${TAG}.zip RUN unzip ${TOOL}-${TAG}.zip -RUN mv ${TOOL}-${TAG} /tools/${TOOL} -ENV PATH="/tools/${TOOL}/bin:${PATH}" +RUN mv ${TOOL}-${TAG} /tools/${TOOL} && rm ${TOOL}-${TAG}.zip +ENV PATH="/tools/${TOOL}:${PATH}" RUN echo "${TOOL} ${REPO} ${TAG}" >> ${VERSION_LOG} # Runner From 9853646c51da8a9eafab6c15e9f30bb27edb027c Mon Sep 17 00:00:00 2001 From: Joseph Kiniry Date: Tue, 24 Jan 2023 16:15:32 +0100 Subject: [PATCH 6/6] Ongoing work updating the Dockerfile for the public release. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f45c37c..5381821 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base -FROM ubuntu:21.04 as base +FROM ubuntu:20.04 as base ARG DEBIAN_FRONTEND=noninteractive RUN mkdir /tools WORKDIR / @@ -283,10 +283,10 @@ RUN cd /tools/${TOOL}/source/lobot/ && cabal v2-build ENV PATH="/tools/${TOOL}:${PATH}" RUN echo "${TOOL} ${REPO} ${TAG}" >> ${VERSION_LOG} -# DocumentationEnricher +# RDE Refinement Finder (aka the DocumentationEnricher) ARG TOOL=der ARG TAG=0.1.5 -ARG REPO=https://github.com/GaloisInc/RDE_RF/ +ARG REPO=https://github.com/GaloisInc/RDE_RF WORKDIR /tmp RUN wget ${REPO}/releases/download/v.${TAG}/${TOOL}-${TAG}.zip RUN unzip ${TOOL}-${TAG}.zip