mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
try some docker compose fixes
This commit is contained in:
parent
b423773391
commit
8b8213a3b7
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
@ -510,9 +510,9 @@ jobs:
|
|||||||
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
|
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
|
||||||
- name: backend | docker-compose database
|
- name: backend | docker-compose database
|
||||||
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
|
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
|
||||||
- name: Sleep for 30 seconds
|
#- name: Sleep for 30 seconds
|
||||||
run: sleep 30s
|
# run: sleep 30s
|
||||||
shell: bash
|
# shell: bash
|
||||||
- name: backend Unit tests | test
|
- name: backend Unit tests | test
|
||||||
run: cd database && yarn && yarn build && cd ../backend && yarn && yarn CI_worklfow_test
|
run: cd database && yarn && yarn build && cd ../backend && yarn && yarn CI_worklfow_test
|
||||||
# run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test
|
# run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test
|
||||||
|
|||||||
@ -26,18 +26,9 @@ services:
|
|||||||
## MARIADB ##############################################
|
## MARIADB ##############################################
|
||||||
#########################################################
|
#########################################################
|
||||||
mariadb:
|
mariadb:
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: ./mariadb/Dockerfile
|
|
||||||
target: mariadb_server
|
|
||||||
environment:
|
|
||||||
- MARIADB_ALLOW_EMPTY_PASSWORD=1
|
|
||||||
- MARIADB_USER=root
|
|
||||||
networks:
|
networks:
|
||||||
- internal-net
|
- internal-net
|
||||||
- external-net
|
- external-net
|
||||||
ports:
|
|
||||||
- 3306:3306
|
|
||||||
volumes:
|
volumes:
|
||||||
- db_test_vol:/var/lib/mysql
|
- db_test_vol:/var/lib/mysql
|
||||||
|
|
||||||
|
|||||||
@ -108,7 +108,7 @@ services:
|
|||||||
# DATABASE #############################################
|
# DATABASE #############################################
|
||||||
########################################################
|
########################################################
|
||||||
database:
|
database:
|
||||||
image: gradido/database:production_up
|
#image: gradido/database:production_up
|
||||||
build:
|
build:
|
||||||
context: ./database
|
context: ./database
|
||||||
target: production_up
|
target: production_up
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user