diff --git a/.gitpod.yml b/.gitpod.yml index d40838a23..50c7c9940 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -14,14 +14,17 @@ tasks: - name: Mock Services command: | - docker compose up + docker compose up ports: - - name: Frontend - description: Port 3000 for the frontend - port: 3000 - onOpen: open-browser + - name: Mock ICA + description: Port 4010 for a mock ICA + port: 4010 + onOpen: ignore + visibility: public - - name: Database UI - description: Port 10700 for the frontend - port: 10700 + - name: Database + description: Port 3306 for the database + port: 3306 + onOpen: ignore + visibility: public diff --git a/mock-ica/docker-compose-mock-ica.yml b/mock-ica/docker-compose-mock-ica.yml index f3d49d663..3c14907c7 100644 --- a/mock-ica/docker-compose-mock-ica.yml +++ b/mock-ica/docker-compose-mock-ica.yml @@ -1,12 +1,11 @@ version: '3.1' services: - haproxy: image: public.ecr.aws/docker/library/haproxy:2.4 container_name: orcabus_haproxy ports: - - "80:80" + - '80:80' volumes: - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg @@ -17,7 +16,7 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v1/wes.json" restart: always ports: - - "4010:4010" + - '4010:4010' volumes: - ../openapi/ica:/openapi/ica @@ -28,7 +27,7 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v1/tes.json" restart: always ports: - - "4011:4010" + - '4011:4010' volumes: - ../openapi/ica:/openapi/ica @@ -39,7 +38,7 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v1/gds.json" restart: always ports: - - "4012:4010" + - '4012:4010' volumes: - ../openapi/ica:/openapi/ica @@ -50,7 +49,7 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v1/ens.json" restart: always ports: - - "4013:4010" + - '4013:4010' volumes: - ../openapi/ica:/openapi/ica @@ -61,7 +60,7 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v1/console.json" restart: always ports: - - "4014:4010" + - '4014:4010' volumes: - ../openapi/ica:/openapi/ica @@ -72,6 +71,6 @@ services: command: mock -d -h 0.0.0.0 "/openapi/ica/v2/openapi_public.yaml" restart: always ports: - - "4015:4010" + - '4015:4010' volumes: - ../openapi/ica:/openapi/ica diff --git a/yarn.lock b/yarn.lock index 2ce7a1521..558459ddf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -529,10 +529,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.55.0": - version: 8.55.0 - resolution: "@eslint/js@npm:8.55.0" - checksum: fa33ef619f0646ed15649b0c2e313e4d9ccee8425884bdbfc78020d6b6b64c0c42fa9d83061d0e6158e1d4274f03f0f9008786540e2efab8fcdc48082259908c +"@eslint/js@npm:8.56.0": + version: 8.56.0 + resolution: "@eslint/js@npm:8.56.0" + checksum: 5804130574ef810207bdf321c265437814e7a26f4e6fac9b496de3206afd52f533e09ec002a3be06cd9adcc9da63e727f1883938e663c4e4751c007d5b58e539 languageName: node linkType: hard @@ -1000,11 +1000,11 @@ __metadata: linkType: hard "@types/babel__generator@npm:*": - version: 7.6.7 - resolution: "@types/babel__generator@npm:7.6.7" + version: 7.6.8 + resolution: "@types/babel__generator@npm:7.6.8" dependencies: "@babel/types": ^7.0.0 - checksum: 03e96ea327a5238f00c38394a05cc01619b9f5f3ea57371419a1c25cf21676a6d327daf802435819f8cb3b8fa10e938a94bcbaf79a38c132068c813a1807ff93 + checksum: 5b332ea336a2efffbdeedb92b6781949b73498606ddd4205462f7d96dafd45ff3618770b41de04c4881e333dd84388bfb8afbdf6f2764cbd98be550d85c6bb48 languageName: node linkType: hard @@ -1095,11 +1095,11 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:^20.4.0": - version: 20.10.4 - resolution: "@types/node@npm:20.10.4" + version: 20.10.5 + resolution: "@types/node@npm:20.10.5" dependencies: undici-types: ~5.26.4 - checksum: 054b296417e771ab524bea63cf3289559c6bdf290d45428f7cc68e9b00030ff7a0ece47b8c99a26b4f47a443919813bcf42beadff2f0bea7d8125fa541d92eb0 + checksum: e216b679f545a8356960ce985a0e53c3a58fff0eacd855e180b9e223b8db2b5bd07b744a002b8c1f0c37f9194648ab4578533b5c12df2ec10cc02f61d20948d2 languageName: node linkType: hard @@ -1476,15 +1476,15 @@ __metadata: linkType: hard "aws-cdk-lib@npm:^2.*, aws-cdk-lib@npm:^2.110.0": - version: 2.114.1 - resolution: "aws-cdk-lib@npm:2.114.1" + version: 2.115.0 + resolution: "aws-cdk-lib@npm:2.115.0" dependencies: "@aws-cdk/asset-awscli-v1": ^2.2.201 "@aws-cdk/asset-kubectl-v20": ^2.1.2 "@aws-cdk/asset-node-proxy-agent-v6": ^2.0.1 "@balena/dockerignore": ^1.0.2 case: 1.6.3 - fs-extra: ^11.1.1 + fs-extra: ^11.2.0 ignore: ^5.3.0 jsonschema: ^1.4.1 minimatch: ^3.1.2 @@ -1494,7 +1494,7 @@ __metadata: yaml: 1.10.2 peerDependencies: constructs: ^10.0.0 - checksum: 67f05b5cf37935413eb82c439a152e8ec91fa413027b1d8874d09cdd71d19dab2e7db8978dc07963b1e877592280d256538184b14eedc02cf1af0787ea043621 + checksum: 8f518d2819096df0254d5113fdd1b3bfd09b2b2710312df3c4018e58498a0b15b7a08fd39642fe6f94ebdf52000abac21a804d9bd05d533c50860efac99cb761 languageName: node linkType: hard @@ -1999,9 +1999,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.601": - version: 1.4.612 - resolution: "electron-to-chromium@npm:1.4.612" - checksum: fbb044289dcea34246254520b05245549013c68c7cc25ce69604ebd496a59d3b41defd10be4a2fca2d5e6e46d92481736e3d1498093e28c96cbe86e48d19634b + version: 1.4.615 + resolution: "electron-to-chromium@npm:1.4.615" + checksum: 9ffb1d0dac11c629bd8aa38efa7d2e3f41de943cf81fb41ab05e960e954c464c168d1f2f7e571813805e85b895279f2882bcafa551a2f23089646008d7a5bd06 languageName: node linkType: hard @@ -2140,13 +2140,13 @@ __metadata: linkType: hard "eslint@npm:^8.44.0": - version: 8.55.0 - resolution: "eslint@npm:8.55.0" + version: 8.56.0 + resolution: "eslint@npm:8.56.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 "@eslint/eslintrc": ^2.1.4 - "@eslint/js": 8.55.0 + "@eslint/js": 8.56.0 "@humanwhocodes/config-array": ^0.11.13 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -2183,7 +2183,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 83f82a604559dc1faae79d28fdf3dfc9e592ca221052e2ea516e1b379b37e77e4597705a16880e2f5ece4f79087c1dd13fd7f6e9746f794a401175519db18b41 + checksum: 883436d1e809b4a25d9eb03d42f584b84c408dbac28b0019f6ea07b5177940bf3cca86208f749a6a1e0039b63e085ee47aca1236c30721e91f0deef5cc5a5136 languageName: node linkType: hard @@ -2348,11 +2348,11 @@ __metadata: linkType: hard "fastq@npm:^1.6.0": - version: 1.15.0 - resolution: "fastq@npm:1.15.0" + version: 1.16.0 + resolution: "fastq@npm:1.16.0" dependencies: reusify: ^1.0.4 - checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a + checksum: 1d40ed1f100ae625e5720484e8602b7ad07649370f1cbc3e34a6b9630a0bfed6946bab0322d8a368a1e3cde87bb9bbb8d3bc2ae01a0c1f022fac1d07c04e4feb languageName: node linkType: hard @@ -2468,7 +2468,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.1.1": +"fs-extra@npm:^11.2.0": version: 11.2.0 resolution: "fs-extra@npm:11.2.0" dependencies: @@ -2504,7 +2504,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:2.3.2": +"fsevents@npm:2.3.2, fsevents@npm:^2.3.2": version: 2.3.2 resolution: "fsevents@npm:2.3.2" dependencies: @@ -2514,17 +2514,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.3.2": - version: 2.3.3 - resolution: "fsevents@npm:2.3.3" - dependencies: - node-gyp: latest - checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317 - conditions: os=darwin - languageName: node - linkType: hard - -"fsevents@patch:fsevents@2.3.2#~builtin": +"fsevents@patch:fsevents@2.3.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin": version: 2.3.2 resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" dependencies: @@ -2533,15 +2523,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@^2.3.2#~builtin": - version: 2.3.3 - resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1" - dependencies: - node-gyp: latest - conditions: os=darwin - languageName: node - linkType: hard - "function-bind@npm:^1.1.2": version: 1.1.2 resolution: "function-bind@npm:1.1.2"