Merge patch-axel-5

axel-h · Apr 12, 2024 · 537f7b9 · 537f7b9
2 parents d856814 + 43efd62
commit 537f7b9
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 146 deletions.
diff --git a/camkes-vm/Dockerfile b/camkes-vm/Dockerfile
@@ -2,39 +2,20 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
+FROM sel4/camkes-vm:latest
 
-ARG WORKSPACE=/workspace
-ARG SCRIPTS=/ci-scripts
-ARG ACTION=camkes-vm
+WORKDIR ci-scripts
+COPY steps.sh ./
+RUN chmod a+rx ./*
 
-FROM trustworthysystems/camkes:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
-
-ARG ACTION
-ARG SCRIPTS
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
-RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
-
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
+WORKDIR /builds
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.yml \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     ./
 
-ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
-WORKDIR ${WORKSPACE}
+WORKDIR /workspace
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/camkes-vm/action.yml b/camkes-vm/action.yml
@@ -20,4 +20,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/camkes-vm:latest'
+  image: 'Dockerfile'
diff --git a/camkes-vm/seL4-platforms b/camkes-vm/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms
diff --git a/seL4-manual/Dockerfile b/seL4-manual/Dockerfile
@@ -2,31 +2,12 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
+FROM sel4/sel4-manual:latest
 
-ARG WORKSPACE=/workspace
+WORKDIR ci-scripts
+COPY steps.sh ./
+RUN chmod a+rx ./*
 
-FROM trustworthysystems/sel4:latest
+WORKDIR /workspace
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       doxygen \
-       texlive \
-       texlive-fonts-extra \
-       texlive-latex-extra \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-
-COPY seL4-manual/steps.sh \
-     scripts/checkout.sh \
-     /usr/bin/
-
-WORKDIR /usr/bin
-RUN chmod a+rx checkout.sh steps.sh
-
-ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
-WORKDIR ${WORKSPACE}
-
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/seL4-manual/action.yml b/seL4-manual/action.yml
@@ -15,4 +15,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4-manual:latest'
+  image: 'Dockerfile'
diff --git a/seL4-manual/seL4-platforms b/seL4-manual/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms
diff --git a/sel4bench/Dockerfile b/sel4bench/Dockerfile
@@ -2,39 +2,20 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
+FROM sel4/sel4bench:latest
 
-ARG WORKSPACE=/workspace
-ARG SCRIPTS=/ci-scripts
-ARG ACTION=sel4bench
+WORKDIR ci-scripts
+COPY steps.sh ./
+RUN chmod a+rx ./*
 
-FROM trustworthysystems/sel4:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
-
-ARG SCRIPTS
-ARG ACTION
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
-RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
-
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
+WORKDIR /builds
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.yml \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     ./
 
-ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
-WORKDIR ${WORKSPACE}
+WORKDIR /workspace
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/sel4bench/action.yml b/sel4bench/action.yml
@@ -23,4 +23,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4bench:latest'
+  image: 'Dockerfile'
diff --git a/sel4bench/seL4-platforms b/sel4bench/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms
diff --git a/sel4test-hw/Dockerfile b/sel4test-hw/Dockerfile
@@ -2,39 +2,20 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
+FROM sel4/sel4test-hw:latest
 
-ARG WORKSPACE=/workspace
-ARG SCRIPTS=/ci-scripts
-ARG ACTION=sel4test-hw
+WORKDIR ci-scripts
+COPY steps.sh ./
+RUN chmod a+rx ./*
 
-FROM trustworthysystems/sel4:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
-
-ARG SCRIPTS
-ARG ACTION
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
-RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
-
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
+WORKDIR /builds
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.yml \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     ./
 
-ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
-WORKDIR ${WORKSPACE}
+WORKDIR /workspace
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/sel4test-hw/action.yml b/sel4test-hw/action.yml
@@ -38,4 +38,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4test-hw:latest'
+  image: 'Dockerfile'
diff --git a/sel4test-hw/seL4-platforms b/sel4test-hw/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms
diff --git a/sel4test-sim/Dockerfile b/sel4test-sim/Dockerfile
@@ -2,39 +2,20 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
+FROM sel4/sel4test-sim:latest
 
-ARG WORKSPACE=/workspace
-ARG SCRIPTS=/ci-scripts
-ARG ACTION=sel4test-sim
+WORKDIR /ci-scripts
+COPY steps.sh ./
+RUN chmod a+rx ./*
 
-FROM trustworthysystems/sel4:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
-
-ARG SCRIPTS
-ARG ACTION
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
-RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
-
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
+WORKDIR /builds
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.yml \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     ./
 
-ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
-WORKDIR ${WORKSPACE}
+WORKDIR /workspace
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/sel4test-sim/action.yml b/sel4test-sim/action.yml
@@ -36,4 +36,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4test-sim:latest'
+  image: 'Dockerfile'
diff --git a/sel4test-sim/seL4-platforms b/sel4test-sim/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms