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 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..8036a26 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nuj-config/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +echo "running nuj stuff" +aws s3 sync s3://"${CONFIG_BUCKET}" /config +echo "nuj config applied" 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