Merge branch 'improveCi' into 'main'
improve ci --check See merge request v3/services/configuration!9
This commit is contained in:
		
						commit
						66bf139286
					
				| 
						 | 
					@ -16,8 +16,9 @@ test:
 | 
				
			||||||
  services:
 | 
					  services:
 | 
				
			||||||
    - docker:dind
 | 
					    - docker:dind
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci up -d
 | 
					    - docker-compose -f docker-compose.ci.tools.yml -p configuration-tools --env-file ci/.env.ci up -d
 | 
				
			||||||
    - sh ci/wait-up.sh
 | 
					    - sh ci/wait-up.sh
 | 
				
			||||||
 | 
					    - docker-compose -f docker-compose.ci.service.yml -p configuration-service --env-file ci/.env.ci up -d
 | 
				
			||||||
    - docker exec -t v3-configuration sh -c "npm run test:integration:ci"
 | 
					    - docker exec -t v3-configuration sh -c "npm run test:integration:ci"
 | 
				
			||||||
  coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
 | 
					  coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
 | 
				
			||||||
  rules:
 | 
					  rules:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,19 @@
 | 
				
			||||||
 | 
					version: '3.8'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					services:
 | 
				
			||||||
 | 
					  api:
 | 
				
			||||||
 | 
					    container_name: v3-configuration
 | 
				
			||||||
 | 
					    build:
 | 
				
			||||||
 | 
					      dockerfile: ci/Dockerfile
 | 
				
			||||||
 | 
					      context: .
 | 
				
			||||||
 | 
					    env_file:
 | 
				
			||||||
 | 
					      - ci/.env.ci
 | 
				
			||||||
 | 
					    ports:
 | 
				
			||||||
 | 
					      - 5003:5003
 | 
				
			||||||
 | 
					    networks:
 | 
				
			||||||
 | 
					      - v3-network
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					networks:
 | 
				
			||||||
 | 
					  v3-network:
 | 
				
			||||||
 | 
					    name: v3-network
 | 
				
			||||||
 | 
					    external: true
 | 
				
			||||||
| 
						 | 
					@ -1,21 +1,6 @@
 | 
				
			||||||
version: '3.8'
 | 
					version: '3.8'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  api:
 | 
					 | 
				
			||||||
    container_name: v3-configuration
 | 
					 | 
				
			||||||
    build:
 | 
					 | 
				
			||||||
      dockerfile: ci/Dockerfile
 | 
					 | 
				
			||||||
      context: .
 | 
					 | 
				
			||||||
    env_file:
 | 
					 | 
				
			||||||
      - ci/.env.ci
 | 
					 | 
				
			||||||
    ports:
 | 
					 | 
				
			||||||
      - 5003:5003
 | 
					 | 
				
			||||||
    depends_on:
 | 
					 | 
				
			||||||
      - db
 | 
					 | 
				
			||||||
      - broker
 | 
					 | 
				
			||||||
    networks:
 | 
					 | 
				
			||||||
      - v3-network
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  db:
 | 
					  db:
 | 
				
			||||||
    container_name: v3-configuration-db-test
 | 
					    container_name: v3-configuration-db-test
 | 
				
			||||||
    image: ${POSTGRES_IMAGE}
 | 
					    image: ${POSTGRES_IMAGE}
 | 
				
			||||||
		Loading…
	
		Reference in New Issue