WIP: 5739-dockerRefactor #1822
|
@ -40,8 +40,8 @@ pipeline {
|
|||
}
|
||||
steps {
|
||||
// sh "docker network ls | grep testing-\${env.STACK_NAME} | awk '{print \$1}' | xargs -r docker network rm"
|
||||
sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm"
|
||||
sh "docker network create testing-salix-5739-dockerrefactor_default"
|
||||
// sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm"
|
||||
// sh "docker network create testing-salix-5739-dockerrefactor_default"
|
||||
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm --stop"
|
||||
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml build --force-rm db back"
|
||||
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml up db"
|
||||
|
@ -80,7 +80,7 @@ pipeline {
|
|||
}
|
||||
steps {
|
||||
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm -s -f"
|
||||
// sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm front"
|
||||
sh "docker network rm testing-${env.STACK_NAME}_default"
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
|
|
|
@ -18,14 +18,10 @@ services:
|
|||
build:
|
||||
context: db
|
||||
dockerfile: Dockerfile
|
||||
ports:
|
||||
- 3308:3306
|
||||
front:
|
||||
image: front
|
||||
restart: always
|
||||
command: ["npx", "jest", "--ci", "--maxWorkers=2"]
|
||||
ports:
|
||||
- 5000:5000
|
||||
build:
|
||||
context: .
|
||||
dockerfile: front/Dockerfile.test
|
||||
|
@ -43,16 +39,16 @@ services:
|
|||
- NODE_ENV
|
||||
depends_on:
|
||||
- db
|
||||
e2e:
|
||||
image: e2e
|
||||
restart: always
|
||||
build:
|
||||
context: .
|
||||
dockerfile: e2e/Dockerfile
|
||||
environment:
|
||||
- NODE_ENV
|
||||
depends_on:
|
||||
- front
|
||||
# e2e:
|
||||
# image: e2e
|
||||
# restart: always
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: e2e/Dockerfile
|
||||
# environment:
|
||||
# - NODE_ENV
|
||||
# depends_on:
|
||||
# - front
|
||||
|
||||
# networks:
|
||||
# stack-network:
|
||||
|
|
Loading…
Reference in New Issue