From 79f2dfca49277dbe9ab0bafd0bf4199c08204466 Mon Sep 17 00:00:00 2001 From: craig Date: Wed, 3 Dec 2025 11:28:27 +0800 Subject: [PATCH 1/3] add nuj config, and aws cli --- Dockerfile | 1 + .../s6-rc.d/init-nuj-config/dependencies.d/init-config | 0 .../dependencies.d/init-openssh-server-config | 0 root/etc/s6-overlay/s6-rc.d/init-nuj-config/run | 7 +++++++ root/etc/s6-overlay/s6-rc.d/init-nuj-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-nuj-config/up | 1 + .../svc-openssh-server/dependencies.d/init-nuj-config | 0 7 files changed, 10 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-openssh-server-config create mode 100755 root/etc/s6-overlay/s6-rc.d/init-nuj-config/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-nuj-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-nuj-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-openssh-server/dependencies.d/init-nuj-config diff --git a/Dockerfile b/Dockerfile index e95c4e0..3525684 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN \ awk '/^P:openssh-server-pam$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ + aws-cli \ openssh-client==${OPENSSH_RELEASE} \ openssh-server-pam==${OPENSSH_RELEASE} \ openssh-sftp-server==${OPENSSH_RELEASE} && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-openssh-server-config b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/dependencies.d/init-openssh-server-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run new file mode 100755 index 0000000..b82f6c0 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +echo "running nuj stuff" +echo "$env" +aws sts get-caller-identity +aws s3 sync s3://"${CONFIG_BUCKET}" /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/type b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/up b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/up new file mode 100644 index 0000000..939b810 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-nuj-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/dependencies.d/init-nuj-config b/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/dependencies.d/init-nuj-config new file mode 100644 index 0000000..e69de29 From 363b33a282525e0580dd25479ab22c584110df05 Mon Sep 17 00:00:00 2001 From: craig Date: Wed, 3 Dec 2025 11:29:37 +0800 Subject: [PATCH 2/3] clean up task logs --- root/etc/s6-overlay/s6-rc.d/init-nuj-config/run | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run index b82f6c0..8036a26 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run @@ -2,6 +2,5 @@ # shellcheck shell=bash echo "running nuj stuff" -echo "$env" -aws sts get-caller-identity aws s3 sync s3://"${CONFIG_BUCKET}" /config +echo "nuj config applied" From 9a1e7963706849353cac473f20d436343b23a149 Mon Sep 17 00:00:00 2001 From: craig Date: Wed, 3 Dec 2025 11:46:51 +0800 Subject: [PATCH 3/3] try disable actions from upstream --- .github/workflows/greetings.yml | 1 + .github/workflows/permissions.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 425a2a3..2f55dd9 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -7,6 +7,7 @@ permissions: jobs: greeting: + if: github.repository != NujSuper/docker-openssh-server permissions: issues: write pull-requests: write diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 02e1bdb..7f772d8 100644 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -9,4 +9,5 @@ on: jobs: permission_check: + if: github.repository != NujSuper/docker-openssh-server uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1