diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c35ecea..f128c8e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,9 @@ build-staging: CI_DEBUG_TRACE: "true" stage: build script: + - ls + - ls apps/cic-staff-client/src/assets/js/ethtx/dist + - ls apps/cic-staff-client/src/app/_services/ - TAG=stag FRONTEND_ENV=staging sh ./scripts/build-push.sh only: - bvander/integration-tests-on-docker diff --git a/apps/cic-staff-client/angular.json b/apps/cic-staff-client/angular.json index 6af91074..b035030c 100644 --- a/apps/cic-staff-client/angular.json +++ b/apps/cic-staff-client/angular.json @@ -97,7 +97,7 @@ "dev": { "browserTarget": "cic-staff-client:build:dev" }, - "dev": { + "staging": { "browserTarget": "cic-staff-client:build:staging" } } diff --git a/apps/cic-staff-client/package.json b/apps/cic-staff-client/package.json index 908e9901..b3534b7a 100644 --- a/apps/cic-staff-client/package.json +++ b/apps/cic-staff-client/package.json @@ -90,13 +90,8 @@ "yargs": "^13.3.2" }, "lint-staged": { - "src/**/*.{js,ts,scss,md,html,json}": [ - "prettier --write", - "git add" - ], - "*.scss": [ - "stylelint src/**/*.scss" - ] + "src/**/*.{js,ts,scss,md,html,json}": ["prettier --write", "git add"], + "*.scss": ["stylelint src/**/*.scss"] }, "husky": { "hooks": { diff --git a/docker-compose.yml b/docker-compose.yml index f429ded3..3d5242b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,18 +81,18 @@ services: # to disable www redirection remove the section: ${STACK_NAME?Variable not set}-www-redirect, - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect - #cicada: - # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cicada:${TAG:-latest} - # build: - # context: ./apps/cic-staff-client - # args: - # FRONTEND_ENV: ${FRONTEND_ENV:-prod} - # deploy: - # labels: - # - traefik.enable=true - # - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} - # - traefik.http.routers.${STACK_NAME?Variable not set}-cicada-http.rule=PathPrefix(`/`) - # - traefik.http.services.${STACK_NAME?Variable not set}-cicada.loadbalancer.server.port=80 + cicada: + image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cicada:${TAG:-latest} + build: + context: ./apps/cic-staff-client + args: + FRONTEND_ENV: ${FRONTEND_ENV:-prod} + deploy: + labels: + - traefik.enable=true + - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} + - traefik.http.routers.${STACK_NAME?Variable not set}-cicada-http.rule=PathPrefix(`/`) + - traefik.http.services.${STACK_NAME?Variable not set}-cicada.loadbalancer.server.port=80 eth: image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/bloxberg-node:${TAG:-latest}