From ec45ead952619c4c1a26037ed9e05caf4ba7a878 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:07:58 +0545 Subject: [PATCH 01/21] run OP as service in CI Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 15 +++++++++++++++ tests/acceptance/config/ssl.rb | 1 + 2 files changed, 16 insertions(+) create mode 100644 tests/acceptance/config/ssl.rb diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ece707ed0..cc9f4d940 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,21 @@ jobs: - nextcloudVersion: stable24 phpVersion: 8.1 runs-on: ubuntu-latest + services: + openproject: + image: openproject/community:12 + ports: + - 80:80 + env: + OPENPROJECT_SECRET_KEY_BASE: secret + OPENPROJECT_HOST__NAME: localhost:8080 + OPENPROJECT_HTTPS: false + OPENPROJECT_PASSWORD__MIN__LENGTH: 0 + OPENPROJECT_ONBOARDING__ENABLED: false + OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_USER: apiadmin + OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_PASSWORD: apiadmin + volumes: + - ${{ github.workspace }}/test/acceptance/config/ssl.rb:/app/config/initializers/ssl.rb steps: - name: Cancel previous runs uses: styfle/cancel-workflow-action@0.9.1 diff --git a/tests/acceptance/config/ssl.rb b/tests/acceptance/config/ssl.rb new file mode 100644 index 000000000..edc39d171 --- /dev/null +++ b/tests/acceptance/config/ssl.rb @@ -0,0 +1 @@ +OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE From 88032c68cf811ea2cd143a299a89d02a62ea189f Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:10:48 +0545 Subject: [PATCH 02/21] try without volumes Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc9f4d940..6d2f9979b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,7 @@ jobs: OPENPROJECT_ONBOARDING__ENABLED: false OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_USER: apiadmin OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_PASSWORD: apiadmin - volumes: - - ${{ github.workspace }}/test/acceptance/config/ssl.rb:/app/config/initializers/ssl.rb + steps: - name: Cancel previous runs uses: styfle/cancel-workflow-action@0.9.1 From 8057fb5e4b97d8d2e8ecb04cc1394bbde003abee Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:25:59 +0545 Subject: [PATCH 03/21] no need to use ssl, we will use localhost only Signed-off-by: Artur Neumann --- tests/acceptance/config/ssl.rb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/acceptance/config/ssl.rb diff --git a/tests/acceptance/config/ssl.rb b/tests/acceptance/config/ssl.rb deleted file mode 100644 index edc39d171..000000000 --- a/tests/acceptance/config/ssl.rb +++ /dev/null @@ -1 +0,0 @@ -OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE From 96b54a9972820a64c2784248c4f35a337b6d975a Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:26:13 +0545 Subject: [PATCH 04/21] try to access openproject Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d2f9979b..03d4418c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,16 +25,16 @@ jobs: openproject: image: openproject/community:12 ports: - - 80:80 + - 8081:80 env: OPENPROJECT_SECRET_KEY_BASE: secret - OPENPROJECT_HOST__NAME: localhost:8080 + OPENPROJECT_HOST__NAME: localhost:8081 OPENPROJECT_HTTPS: false OPENPROJECT_PASSWORD__MIN__LENGTH: 0 OPENPROJECT_ONBOARDING__ENABLED: false OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_USER: apiadmin OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_PASSWORD: apiadmin - + steps: - name: Cancel previous runs uses: styfle/cancel-workflow-action@0.9.1 @@ -45,6 +45,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: try OpenProject + run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin + - name: Setup PHP ${{ matrix.phpVersion }} uses: shivammathur/setup-php@v2 with: From a90fa897ebdaf8909fa7cdf4d8e5bdcc8e316c08 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:32:18 +0545 Subject: [PATCH 05/21] try to access OP much later Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03d4418c5..cb0ad59a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,9 +45,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: try OpenProject - run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin - - name: Setup PHP ${{ matrix.phpVersion }} uses: shivammathur/setup-php@v2 with: @@ -123,6 +120,9 @@ jobs: cd apps/integration_openproject make api-test + - name: try OpenProject + run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin + - name: JS Code Coverage Summary Report if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '7.4' }} uses: romeovs/lcov-reporter-action@v0.3.1 From 1fca0421922e4c76a70c407be64dc0dc9818ad7b Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:47:13 +0545 Subject: [PATCH 06/21] wait for OP Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb0ad59a9..c4118b95e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,12 @@ jobs: cd apps/integration_openproject make api-test + - name: wait on OpenProject + uses: iFaxity/wait-on-action@v1 + with: + resource: http://localhost:8081/api/v3/ + timeout: 10000 + - name: try OpenProject run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin From e850f8c1bfd45378c0b9c7299cd734b2e46edc5e Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:50:55 +0545 Subject: [PATCH 07/21] try to access NC Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4118b95e..ff0ad894f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,9 @@ jobs: - name: try OpenProject run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin + - name: try Nextcloud + run: curl http://localhost:8080/status.php + - name: JS Code Coverage Summary Report if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '7.4' }} uses: romeovs/lcov-reporter-action@v0.3.1 From 88b2d2736061dbd8261e814f1b39cf9c92f2f736 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:51:31 +0545 Subject: [PATCH 08/21] skip some tests for now Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff0ad894f..0f41926cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,16 +95,16 @@ jobs: - name: Install NPM Dependencies run: npm install - - name: JS Lint - run: npm run lint - - - name: Style Lint - run: npm run stylelint - - - name: PHP & Vue Unit Tests - run: | - make phpunit - make jsunit +# - name: JS Lint +# run: npm run lint +# +# - name: Style Lint +# run: npm run stylelint +# +# - name: PHP & Vue Unit Tests +# run: | +# make phpunit +# make jsunit - name: API Tests env: @@ -118,7 +118,7 @@ jobs: ./occ a:e integration_openproject php -S localhost:8080 2> /dev/null & cd apps/integration_openproject - make api-test +# make api-test - name: wait on OpenProject uses: iFaxity/wait-on-action@v1 From 1d1d877fb726ed28fb9d5beba6efed4d1ceaf736 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 17:56:42 +0545 Subject: [PATCH 09/21] wait longer for OP to start Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f41926cb..f0f6b4e16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: uses: iFaxity/wait-on-action@v1 with: resource: http://localhost:8081/api/v3/ - timeout: 10000 + timeout: 240000 - name: try OpenProject run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin From 375d90b06edc1e0809ba27cd1e9d8448681c497c Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 26 Oct 2022 18:07:15 +0545 Subject: [PATCH 10/21] use GET to wait, not HEAD Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0f6b4e16..9ab7cb7e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: - name: wait on OpenProject uses: iFaxity/wait-on-action@v1 with: - resource: http://localhost:8081/api/v3/ + resource: http-get://localhost:8081/api/v3/ timeout: 240000 - name: try OpenProject From 4b49ee0d3a3b4926548f4c5814ce7112f0a10eba Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 13 Dec 2022 16:09:04 +0545 Subject: [PATCH 11/21] run NC from docker Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 72 ++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ab7cb7e9..a14af10c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,28 @@ jobs: OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_USER: apiadmin OPENPROJECT_AUTHENTICATION_GLOBAL__BASIC__AUTH_PASSWORD: apiadmin + proxy: + image: ghcr.io/juliushaertl/nextcloud-dev-nginx:latest + ports: + - "80:80" + - "443:443" + env: + DHPARAM_BITS: 2048 + DHPARAM_GENERATION: "false" + HTTPS_METHOD: "noredirect" + HSTS: "off" + + nextcloud: + image: ghcr.io/juliushaertl/nextcloud-dev-php-81:latest + env: + NEXTCLOUD_AUTOINSTALL: "YES" + NEXTCLOUD_AUTOINSTALL_APPS: "viewer, activity" + VIRTUAL_HOST: "nextcloud" + NEXTCLOUD_TRUSTED_DOMAINS: nextcloud + ports: + - 8080:80 + + steps: - name: Cancel previous runs uses: styfle/cancel-workflow-action@0.9.1 @@ -82,18 +104,18 @@ jobs: - name: Install PHP Dependencies run: | composer install --no-progress --prefer-dist --optimize-autoloader - git clone --depth 1 https://github.com/nextcloud/server.git -b ${{ matrix.nextcloudVersion }} - cd server && git submodule update --init - ./occ maintenance:install --admin-pass=admin +# git clone --depth 1 https://github.com/nextcloud/server.git -b ${{ matrix.nextcloudVersion }} +# cd server && git submodule update --init +# ./occ maintenance:install --admin-pass=admin - - name: PHP stan - run: make phpstan - - - name: PHP code style - run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) +# - name: PHP stan +# run: make phpstan +# +# - name: PHP code style +# run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) - - name: Install NPM Dependencies - run: npm install +# - name: Install NPM Dependencies +# run: npm install # - name: JS Lint # run: npm run lint @@ -106,18 +128,18 @@ jobs: # make phpunit # make jsunit - - name: API Tests - env: - NEXTCLOUD_BASE_URL: http://localhost:8080 - run: | - git clone --depth 1 https://github.com/nextcloud/activity.git -b ${{ matrix.nextcloudVersion }} server/apps/activity - mkdir -p server/apps/integration_openproject - cp -r `ls -A | grep -v 'server'` server/apps/integration_openproject/ - cd server - ./occ a:e activity - ./occ a:e integration_openproject - php -S localhost:8080 2> /dev/null & - cd apps/integration_openproject +# - name: API Tests +# env: +# NEXTCLOUD_BASE_URL: http://localhost:8080 +# run: | +# git clone --depth 1 https://github.com/nextcloud/activity.git -b ${{ matrix.nextcloudVersion }} server/apps/activity +# mkdir -p server/apps/integration_openproject +# cp -r `ls -A | grep -v 'server'` server/apps/integration_openproject/ +# cd server +# ./occ a:e activity +# ./occ a:e integration_openproject +# php -S localhost:8080 2> /dev/null & +# cd apps/integration_openproject # make api-test - name: wait on OpenProject @@ -132,6 +154,12 @@ jobs: - name: try Nextcloud run: curl http://localhost:8080/status.php + - name: try Nextcloud2 + run: curl http://nextcloud:8080/status.php + + - name: try Nextcloud3 + run: curl -k https://nextcloud:8080/status.php + - name: JS Code Coverage Summary Report if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '7.4' }} uses: romeovs/lcov-reporter-action@v0.3.1 From aef4852dfda3af6f87d076224c0e2f3184a40592 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 13 Dec 2022 16:17:02 +0545 Subject: [PATCH 12/21] next try Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a14af10c5..5a64ce91a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ jobs: name: CI strategy: matrix: - nextcloudVersion: [ stable22, stable23, stable24, stable25, master ] - phpVersion: [ 7.4, 8.0, 8.1 ] + nextcloudVersion: [stable25 ] + phpVersion: [ 8.1 ] exclude: - nextcloudVersion: stable22 phpVersion: 8.1 @@ -47,7 +47,7 @@ jobs: HSTS: "off" nextcloud: - image: ghcr.io/juliushaertl/nextcloud-dev-php-81:latest + image: ghcr.io/juliushaertl/nextcloud-dev-php81:latest env: NEXTCLOUD_AUTOINSTALL: "YES" NEXTCLOUD_AUTOINSTALL_APPS: "viewer, activity" From 5c442955f00e532568050ed22613dc119fef1c53 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 13 Dec 2022 16:27:31 +0545 Subject: [PATCH 13/21] try PHP 8.0 Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a64ce91a..da879ceb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: HSTS: "off" nextcloud: - image: ghcr.io/juliushaertl/nextcloud-dev-php81:latest + image: ghcr.io/juliushaertl/nextcloud-dev-php80:latest env: NEXTCLOUD_AUTOINSTALL: "YES" NEXTCLOUD_AUTOINSTALL_APPS: "viewer, activity" From 1577f280528c675ab8bf76cacd4d5a421866945a Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 13 Dec 2022 16:36:38 +0545 Subject: [PATCH 14/21] try https Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da879ceb2..f0d14ea01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,6 +154,9 @@ jobs: - name: try Nextcloud run: curl http://localhost:8080/status.php + - name: try Nextcloud + run: curl https://localhost/status.php + - name: try Nextcloud2 run: curl http://nextcloud:8080/status.php From 8329b09f98a11097bf8dcb3fc1ccd4e4a7df08d1 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 13 Dec 2022 16:55:42 +0545 Subject: [PATCH 15/21] sleep longer for NC Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0d14ea01..e8da79a5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,17 +148,22 @@ jobs: resource: http-get://localhost:8081/api/v3/ timeout: 240000 + - name: wait on Nextcloud + uses: GuillaumeFalourd/wait-sleep-action@v1 + with: + time: '10m' + - name: try OpenProject run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin - name: try Nextcloud - run: curl http://localhost:8080/status.php + run: curl http://localhost:8080/status.php -v - name: try Nextcloud - run: curl https://localhost/status.php + run: curl https://localhost/status.php -v - name: try Nextcloud2 - run: curl http://nextcloud:8080/status.php + run: curl http://nextcloud:8080/status.php -v - name: try Nextcloud3 run: curl -k https://nextcloud:8080/status.php From 6f436321ce436d2ff4e6e8ed449efb8fb90cf5f1 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 14 Dec 2022 09:46:07 +0545 Subject: [PATCH 16/21] better waiting Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8da79a5f..9a310d191 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,9 +149,7 @@ jobs: timeout: 240000 - name: wait on Nextcloud - uses: GuillaumeFalourd/wait-sleep-action@v1 - with: - time: '10m' + run: until curl -s -f http://localhost:8080/status.php | grep '"installed":true'; do echo .; sleep 10; done - name: try OpenProject run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin From d13a5e5e0b537e9690fd4cf7cf869cb6fff1345a Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 14 Dec 2022 09:48:16 +0545 Subject: [PATCH 17/21] try all kind of ways to connect to nextcloud Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a310d191..fcf7312dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,16 +155,22 @@ jobs: run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin - name: try Nextcloud - run: curl http://localhost:8080/status.php -v + run: curl http://localhost:8080/status.php -v || true - name: try Nextcloud - run: curl https://localhost/status.php -v + run: curl https://localhost/status.php -v || true - name: try Nextcloud2 - run: curl http://nextcloud:8080/status.php -v + run: curl http://nextcloud:8080/status.php -v || true - name: try Nextcloud3 - run: curl -k https://nextcloud:8080/status.php + run: curl -k https://nextcloud:8080/status.php || true + + - name: try Nextcloud3 + run: curl -k https://nextcloud/status.php || true + + - name: try Nextcloud4 + run: curl -k https://proxy/status.php || true - name: JS Code Coverage Summary Report if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '7.4' }} From f01c9ec3e7ef59e36d8faf9b529e06f9663c34fb Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 5 Jan 2023 12:44:48 +0545 Subject: [PATCH 18/21] run ci jobs in container Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcf7312dd..26cc3806a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,8 @@ jobs: - nextcloudVersion: stable24 phpVersion: 8.1 runs-on: ubuntu-latest + # Docker Hub image that `build` executes in + container: ubuntu:latest services: openproject: image: openproject/community:12 From c91ea4b95534480606aa14e2ff125389978a0e11 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 5 Jan 2023 12:52:24 +0545 Subject: [PATCH 19/21] expect openproject be availiable on "openproject" hostname Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26cc3806a..32cf5a9b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,11 +26,9 @@ jobs: services: openproject: image: openproject/community:12 - ports: - - 8081:80 env: OPENPROJECT_SECRET_KEY_BASE: secret - OPENPROJECT_HOST__NAME: localhost:8081 + OPENPROJECT_HOST__NAME: openproject OPENPROJECT_HTTPS: false OPENPROJECT_PASSWORD__MIN__LENGTH: 0 OPENPROJECT_ONBOARDING__ENABLED: false @@ -147,7 +145,7 @@ jobs: - name: wait on OpenProject uses: iFaxity/wait-on-action@v1 with: - resource: http-get://localhost:8081/api/v3/ + resource: http-get://openproject/api/v3/ timeout: 240000 - name: wait on Nextcloud From 7b778e5bba74dfb3e2fea3bb141f675269ea9054 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 5 Jan 2023 13:10:22 +0545 Subject: [PATCH 20/21] expect services to be availiable through domain names Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32cf5a9b0..bbdf8152c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,9 +53,6 @@ jobs: NEXTCLOUD_AUTOINSTALL_APPS: "viewer, activity" VIRTUAL_HOST: "nextcloud" NEXTCLOUD_TRUSTED_DOMAINS: nextcloud - ports: - - 8080:80 - steps: - name: Cancel previous runs @@ -149,22 +146,13 @@ jobs: timeout: 240000 - name: wait on Nextcloud - run: until curl -s -f http://localhost:8080/status.php | grep '"installed":true'; do echo .; sleep 10; done + run: until curl -s -f http://nextcloud/status.php | grep '"installed":true'; do echo .; sleep 10; done - name: try OpenProject - run: curl http://localhost:8081/api/v3/users -u apiadmin:apiadmin - - - name: try Nextcloud - run: curl http://localhost:8080/status.php -v || true - - - name: try Nextcloud - run: curl https://localhost/status.php -v || true + run: curl http://openproject/api/v3/users -u apiadmin:apiadmin - name: try Nextcloud2 - run: curl http://nextcloud:8080/status.php -v || true - - - name: try Nextcloud3 - run: curl -k https://nextcloud:8080/status.php || true + run: curl http://nextcloud/status.php -v || true - name: try Nextcloud3 run: curl -k https://nextcloud/status.php || true From acd86c19753d14229ca657d070e152bb0722a042 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 5 Jan 2023 13:51:02 +0545 Subject: [PATCH 21/21] add docker.sock to proxy Signed-off-by: Artur Neumann --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbdf8152c..1140db16f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,6 +45,8 @@ jobs: DHPARAM_GENERATION: "false" HTTPS_METHOD: "noredirect" HSTS: "off" + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro nextcloud: image: ghcr.io/juliushaertl/nextcloud-dev-php80:latest