From d8b1237a5d86810a4834d12c6f5a566cb34d1a2c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 26 May 2022 20:11:18 +0100 Subject: [PATCH] Add CI check --- Dockerfile | 3 +++ Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ ci-check/99-ci-service-check | 0 .../s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base | 0 .../s6-rc.d/99-ci-service-check/dependencies.d/legacy-services | 0 .../s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user | 0 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type | 1 + root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up | 1 + 9 files changed, 11 insertions(+) create mode 100644 ci-check/99-ci-service-check create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up diff --git a/Dockerfile b/Dockerfile index 8951487..2bed43d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,9 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz +# copy ci-checks +COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d + # patch cont-init for docker-mods COPY patch/ /tmp/patch RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 52bec93..c73127c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -40,6 +40,9 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz +# copy ci-checks +COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d + # patch cont-init for docker-mods COPY patch/ /tmp/patch RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3b54adc..a56a523 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -40,6 +40,9 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz +# copy ci-checks +COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d + # patch cont-init for docker-mods COPY patch/ /tmp/patch RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch diff --git a/ci-check/99-ci-service-check b/ci-check/99-ci-service-check new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up new file mode 100644 index 0000000..06ccdf9 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up @@ -0,0 +1 @@ +echo "[services.d] done." \ No newline at end of file