Simplify docker-compose.test.yml

docker-compose.test.yml

@@ -1,213 +1,12 @@
 version: '2.1'
 
-x-defaults: &defaults
-  restart: unless-stopped
-
-x-build_defaults: &build_defaults
-  dockerfile: dev.Dockerfile
-
 services:
-  adminer:
-    <<: *defaults
-    container_name: adminer
-    environment:
-      ADMINER_DESIGN: pepa-linha
-    image: adminer:4.8.0
-    ports:
-      - 5050:8080
-    volumes:
-      - ./adminer-plugins:/var/www/html/plugins-enabled
-
   backend:
-    <<: *defaults
-    build:
-      <<: *build_defaults
-      context: services/backend
-    depends_on:
-      - kone-db
-      - redis
-      - sis-db
-      - user-db
-    env_file:
-      - .env
-    environment:
-      DB_URL_KONE: postgres://postgres@kone-db:5432/kone-db
-      DB_URL_USER: postgres://postgres@user-db:5432/user-db
-      FRONT_URL: http://localhost:3000
-      REDIS: redis
-      SECRET_TOKEN: dev
-      SIS_DB_URL: postgres://postgres@sis-db:5432/sis-db
-      SIS_UPDATER_URL: http://sis-updater-scheduler:8082
-      IMPORTER_DB_API_URL: 'https://api-toska.apps.ocp-prod-0.k8s.it.helsinki.fi/importer'
-      JAMI_URL: 'http://jami:3003/'
-    ports:
-      - 8080:8080
-    profiles:
-      - oodikone
     volumes:
       - backend-nodemod:/opt/app-root/src/node_modules
-      - ./services/backend/:/opt/app-root/src
       - ./services/backend/instrumented:/opt/app-root/src/src
 
   frontend:
-    <<: *defaults
-    build:
-      <<: *build_defaults
-      context: services/frontend
-    container_name: frontend
-    ports:
-      - 3000:3000
-    profiles:
-      - oodikone
     volumes:
       - frontend-nodemod:/opt/app-root/src/node_modules
-      - ./services/frontend/:/opt/app-root/src
       - ./services/frontend/instrumented:/opt/app-root/src/src
-
-  kone-db:
-    <<: *defaults
-    container_name: kone-db
-    image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db
-    profiles:
-      - oodikone
-    volumes:
-      - kone-db-data:/data
-
-  redis:
-    <<: *defaults
-    command: 'redis-server --appendonly yes'
-    container_name: redis
-    image: redis:6.2.13
-    ports:
-      - '6379:6379'
-    volumes:
-      - redis-data:/data
-
-  sis-db:
-    <<: *defaults
-    container_name: sis-db
-    image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db
-    volumes:
-      - sis-db-data:/data
-    shm_size: 2gb
-    ports:
-      - 12345:5432
-
-  sis-importer-db:
-    <<: *defaults
-    container_name: sis-importer-db
-    image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-importer-db
-    profiles:
-      - updater
-    volumes:
-      - sis-importer-db-data:/data
-    ports:
-      - 12346:5432
-
-  sis-updater-nats:
-    <<: *defaults
-    command: '-cid sis-updater-nats -m 8222 -p 4222 --max_channels 1000 --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
-    profiles:
-      - updater
-
-  sis-updater-scheduler:
-    <<: *defaults
-    build:
-      <<: *build_defaults
-      context: updater/sis-updater-scheduler
-    container_name: sis-updater-scheduler
-    depends_on:
-      - redis
-      - sis-importer-db
-      - sis-updater-nats
-    environment:
-      REDIS_URI: //redis:6379
-      SECRET_TOKEN: dev
-      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
-    ports:
-      - 8082:8082
-    profiles:
-      - updater
-    volumes:
-      - sis-updater-scheduler-nodemod:/opt/app-root/src/node_modules
-      - ./updater/sis-updater-scheduler/:/opt/app-root/src
-
-  sis-updater-worker:
-    <<: *defaults
-    build:
-      <<: *build_defaults
-      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_PASSWORD: postgres
-      SIS_NATS_TOKEN: dev
-      SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
-    profiles:
-      - updater
-    volumes:
-      - sis-updater-worker-nodemod:/opt/app-root/src/node_modules
-      - ./updater/sis-updater-worker/:/opt/app-root/src
-
-  user-db:
-    <<: *defaults
-    container_name: user-db
-    image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db
-    profiles:
-      - oodikone
-    volumes:
-      - user-db-data:/data
-
-  jami:
-    <<: *defaults
-    image: quay.io/toska/jami:production
-    env_file:
-      - .env
-    environment:
-      - npm_config_cache=/tmp
-      - PORT=3003
-      - NODE_ENV=dev
-      - DATABASE_URL=postgres://postgres:postgres@jami-db:5432/postgres
-    ports:
-      - 3003:3003
-    container_name: jami
-
-  jami-db:
-    <<: *defaults
-    image: postgres:13.2
-    environment:
-      - PGDATA=/data
-      - POSTGRES_PASSWORD=postgres
-    container_name: jami-db
-    ports:
-      - 5433:5432
-    volumes:
-      - jami-data:/data
-
-volumes:
-  backend-nodemod:
-  frontend-nodemod:
-  kone-db-data:
-  redis-data:
-  sis-db-data:
-  sis-importer-db-data:
-  sis-updater-scheduler-nodemod:
-  sis-updater-worker-nodemod:
-  user-db-data:
-  jami-data:

run.sh

@@ -71,7 +71,7 @@ parse_env() {
     env="--file docker-compose.yml --file docker-compose.real.yml"
   fi
   if [[ "$version" == "test" ]]; then
-    env="--file docker-compose.test.yml"
+    env="--file docker-compose.yml --file docker-compose.test.yml"
   fi
   return 0
 }