From b9fc198b0131bb87d833455fe5d99cc38cb671e6 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sun, 2 Jul 2023 21:00:15 +0300 Subject: [PATCH 1/4] daemon-register Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 5 ++++- Makefile | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index e1c35922..6639b8dc 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -266,8 +266,11 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s + php occ app_ecosystem_v2:daemon: regidocker-install Docker unix-socket 0 0 \ + --net=host --host="127.0.0.1" --expose-to-host=true php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \ - --host 127.0.0.1 --port 9002 \ + --daemon-config-id 0 \ + --port 9002 \ --secret $app_secret \ -e --force-scopes --system-app kill -15 $(cat /tmp/_install.pid) diff --git a/Makefile b/Makefile index 0c4e1926..81726e8f 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,12 @@ start: stop: docker container stop to_gif +register_app: + nextcloud_url=http://nextcloud.local/index.php app_name=nc_py_api app_version=1.0.0 \ + app_secret=tC6vkwPhcppjMykD1r0n9NlI95uJMBYjs5blpIcA1PAdoPDmc5qoAjaBAkyocZ6E\ + X1T8Pi+T5papEolTLxz3fJSPS8ffC4204YmggxPsbJdCkXHWNPHKWS9B+vTj2SIV \ + python3 tests/_install.py + remove: docker rm to_gif From f1e849cc5229dcc2ac249f43665656a4924ed27a Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sun, 2 Jul 2023 23:34:32 +0300 Subject: [PATCH 2/4] daemon-register Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 6639b8dc..ef928936 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -266,7 +266,7 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon: regidocker-install Docker unix-socket 0 0 \ + php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \ --net=host --host="127.0.0.1" --expose-to-host=true php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \ --daemon-config-id 0 \ From 79acc4c9f21dabf398e37f7a6f2ecf7e88d23803 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Mon, 3 Jul 2023 00:04:27 +0300 Subject: [PATCH 3/4] daemon-register Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index ef928936..cc98450f 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -269,7 +269,7 @@ jobs: php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \ --net=host --host="127.0.0.1" --expose-to-host=true php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \ - --daemon-config-id 0 \ + --daemon-config-id 1 \ --port 9002 \ --secret $app_secret \ -e --force-scopes --system-app From 6c8a6d33e0bf87e71227e18c433152e4504141b8 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Mon, 3 Jul 2023 00:40:20 +0300 Subject: [PATCH 4/4] daemon-register Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index cc98450f..aacada7e 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -134,8 +134,11 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s + php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \ + --net=host --host="127.0.0.1" --expose-to-host=true php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \ - --host 127.0.0.1 --port 9002 \ + --daemon-config-id 1 \ + --port 9002 \ --secret $app_secret \ -e --force-scopes --system-app kill -15 $(cat /tmp/_install.pid) @@ -395,8 +398,11 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s + php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \ + --net=host --host="127.0.0.1" --expose-to-host=true php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \ - --host 127.0.0.1 --port 9002 \ + --daemon-config-id 1 \ + --port 9002 \ --secret $app_secret \ -e --force-scopes --system-app kill -15 $(cat /tmp/_install.pid)