Build anon sis-db and push to toska hub if there are new sis-db migrations

This commit is contained in:
Otto Ahoniemi
2021-12-09 01:42:16 +02:00
parent 2429fdaeb8
commit 7fe932750b
2 changed files with 75 additions and 6 deletions
+26 -1
View File
@@ -59,7 +59,6 @@ jobs:
run: npm run eslint services/userservice
# === Build images ===
build_backend:
name: 'Build backend'
runs-on: ubuntu-latest
@@ -142,6 +141,24 @@ jobs:
with:
path: /tmp/userservice.tar
build_and_push_anon_sis_db:
name: 'Build anon sis-db and push to toska hub if new migrations have been added'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: dorny/paths-filter@v2
id: check_migrations
with:
filters: |
migrations:
- 'updater/sis-updater-worker/src/db/migrations/**'
- name: 'Run sis-updater-worker and '
if: steps.check_migrations.outputs.migrations == 'true'
run: |
docker-compose --file docker-compose.ci.yml up --detach sis-updater-worker
sleep 30 # wait for sis-updater-worker to start and run migrations
./anonyymioodi/commit_and_push_to_toska_hub.sh sis-db
# === Integration tests ===
#
run_userservice_integration_tests:
@@ -160,6 +177,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -203,6 +221,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -246,6 +265,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -289,6 +309,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -332,6 +353,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -375,6 +397,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -418,6 +441,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -465,6 +489,7 @@ jobs:
- build_backend
- build_frontend
- build_userservice
- build_and_push_anon_sis_db
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
+49 -5
View File
@@ -2,7 +2,6 @@ x-defaults: &defaults
restart: unless-stopped
services:
backend:
<<: *defaults
container_name: backend
@@ -11,7 +10,7 @@ services:
- redis
- sis-db
environment:
CI: "true"
CI: 'true'
DB_URL_KONE: postgres://postgres@kone-db:5432/kone-db
FRONT_URL: http://localhost:1337
REDIS: redis
@@ -31,11 +30,15 @@ services:
kone-db:
<<: *defaults
container_name: kone-db
environment:
PGDATA: /data
POSTGRES_DB: kone-db
POSTGRES_HOST_AUTH_METHOD: trust
image: registry.toska.cs.helsinki.fi/kone-db
redis:
<<: *defaults
command: "redis-server --appendonly yes"
command: 'redis-server --appendonly yes'
container_name: redis
image: redis
ports:
@@ -45,10 +48,19 @@ services:
<<: *defaults
container_name: sis-db
image: registry.toska.cs.helsinki.fi/sis-db
environment:
PGDATA: /data
POSTGRES_DB: sis-db
POSTGRES_HOST_AUTH_METHOD: trust
shm_size: 2gb
user-db:
<<: *defaults
container_name: user-db
environment:
PGDATA: /data
POSTGRES_DB: user-db
POSTGRES_HOST_AUTH_METHOD: trust
image: registry.toska.cs.helsinki.fi/user-db
userservice:
@@ -57,7 +69,7 @@ services:
depends_on:
- user-db
environment:
CI: "true"
CI: 'true'
DB_URL: postgres://postgres@user-db:5432/user-db
SECRET: Luukk4inenApprov3dVitunMinttuSalainenAvain666NurmivaaraPJ2019
TOKEN_SECRET: IWannaBeTheVeryBest
@@ -71,6 +83,38 @@ services:
- backend
- userservice
ports:
- 1337:80
- 1337:80
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
# Following services are used to run sis-updater-worker when anon sis-db needs to be updated
sis-importer-db:
<<: *defaults
container_name: user-db
image: registry.toska.cs.helsinki.fi/sis-importer-db
sis-updater-worker:
<<: *defaults
build:
target: development
context: updater/sis-updater-worker
depends_on:
- redis
- sis-db
- sis-importer-db
- sis-updater-nats
environment:
DB_URL: postgres://postgres@sis-db:5432/sis-db
REDIS_URI: //redis:6379
SIS_IMPORTER_DATABASE: sis-importer-db
SIS_IMPORTER_HOST: sis-importer-db
SIS_IMPORTER_PASSWORD: postgres
SIS_IMPORTER_USER: postgres
SIS_NATS_TOKEN: dev
SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
sis-updater-nats:
<<: *defaults
command: '-cid sis-updater-nats -m 8222 -p 4222 --max_age 2h --hb_fail_count 2 --hb_timeout 10s --hb_interval 10s --auth dev --file_slice_max_bytes 0 --file_slice_max_age 60s --max_msgs 0 -store file -dir datastore'
container_name: sis-updater-nats
image: nats-streaming:0.16.2