From e8695869d3329ad84e0d081a6ae8b5190ce41a71 Mon Sep 17 00:00:00 2001 From: Robert Nowakowski Date: Tue, 12 Jul 2022 14:36:20 +0200 Subject: [PATCH] Fix for tests and build --- .circleci/config.yml | 1 - docker-compose-cypress.yml | 9 +++++++++ docker-compose-spree.yml | 9 +++++++++ docker-compose-test-runtime.yml | 5 +++++ package.json | 4 ++-- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d87f486..82a9a211 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,6 @@ jobs: name: Test command: | . .circleci/load-nvm.sh - echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_LOGIN" --password-stdin >/dev/null 2>&1 npm run test workflows: diff --git a/docker-compose-cypress.yml b/docker-compose-cypress.yml index 46215c49..4fa1cc0d 100644 --- a/docker-compose-cypress.yml +++ b/docker-compose-cypress.yml @@ -5,11 +5,20 @@ services: build: context: . dockerfile: ./docker/express/Dockerfile.express + networks: + - vendo-dev cypress: build: context: . dockerfile: ./tests/Dockerfile.cypress + networks: + - vendo-dev docker-host: image: qoomon/docker-host:3.0.3 cap_add: ['NET_ADMIN', 'NET_RAW'] restart: on-failure + networks: + - vendo-dev + +networks: + vendo-dev: diff --git a/docker-compose-spree.yml b/docker-compose-spree.yml index 22ebc44d..cc599539 100644 --- a/docker-compose-spree.yml +++ b/docker-compose-spree.yml @@ -9,10 +9,14 @@ services: - '5432:5432' volumes: - 'postgres:/var/lib/postgresql/data' + networks: + - vendo-dev redis: image: redis:6.2-alpine volumes: - 'redis:/data' + networks: + - vendo-dev spree: # Runs production Spree depends_on: - 'postgres' @@ -34,9 +38,14 @@ services: SECRET_KEY_BASE: skb ALLOWED_ORIGIN_HOSTS: '*' RACK_CORS_DEBUG: 'true' + networks: + - vendo-dev volumes: spree: bundle_cache: redis: postgres: + +networks: + vendo-dev: diff --git a/docker-compose-test-runtime.yml b/docker-compose-test-runtime.yml index 46027cdd..ae26e14f 100644 --- a/docker-compose-test-runtime.yml +++ b/docker-compose-test-runtime.yml @@ -6,3 +6,8 @@ services: build: context: . dockerfile: ./Dockerfile.test-runtime + networks: + - vendo-dev + +networks: + vendo-dev: diff --git a/package.json b/package.json index 9940c176..ba012f9f 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/spark-solutions/spree-storefront-api-v2-js-sdk.git" + "url": "git+https://github.com/vendo-dev/js-sdk.git" }, "author": "Spark Solutions (https://sparksolutions.co)", "license": "MIT", "bugs": { - "url": "https://github.com/spark-solutions/spree-storefront-api-v2-js-sdk/issues" + "url": "https://github.com/vendo-dev/js-sdk/issues" }, "homepage": "https://guides.spreecommerce.org/api/v2", "devDependencies": {