From 80509980e4ef68788b825de6595792c3ec53381d Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 25 Apr 2021 22:16:06 +0800 Subject: [PATCH] Build: try to fix docker support --- .github/workflows/lo-test.yml | 3 +++ r1p.config.seed | 1 + r2s.config.seed | 1 + r4s.config.seed | 1 + 4 files changed, 6 insertions(+) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index a8fc107..8336471 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -263,6 +263,9 @@ jobs: - name: Generate firmware run: | + if [[ ${{ github.event.client_payload.device || github.event.inputs.device }} == *"r1s"* ]]; then + sudo poweroff + fi sudo sysctl vm.swappiness=0 curl -L https://github.com/klever1988/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf - mv *imagebuilder* ib && cd ib diff --git a/r1p.config.seed b/r1p.config.seed index 2b38b85..68a0b0f 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -28,6 +28,7 @@ CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y diff --git a/r2s.config.seed b/r2s.config.seed index 23ca998..4b0cc2b 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -28,6 +28,7 @@ CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y diff --git a/r4s.config.seed b/r4s.config.seed index f16b58e..df1f022 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -28,6 +28,7 @@ CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y