[RAB-2] adding code to retrieve legacy quotes

adding migration script for legacy quotes
changing docker-compose file to use different container names
This commit is contained in:
Sheldan
2022-05-15 16:13:48 +02:00
parent da6c4a5b23
commit 199ca18cac
80 changed files with 3038 additions and 28 deletions

View File

@@ -1,3 +1,4 @@
COMPOSE_PROJECT_NAME=r-austria
# database configuration
DATABASE_HOST=database
DATABASE_PORT=5432

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
db:
image: ${REGISTRY_PREFIX}r_austria_bot_database:${R_AUSTRIA_BOT_VERSION}
container_name: database
container_name: ${COMPOSE_PROJECT_NAME}_database
restart: always
environment:
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
@@ -13,15 +13,15 @@ services:
networks:
- raustriabot
volumes:
- r-austria-bot-db-data:/var/lib/postgresql/data
- db-data:/var/lib/postgresql/data
deployment_container:
container_name: deployment
container_name: ${COMPOSE_PROJECT_NAME}_deployment
image: ${REGISTRY_PREFIX}r_austria_bot_deployment:${R_AUSTRIA_BOT_VERSION}
depends_on:
- db
environment:
DB_PASS: ${DATABASE_PASSWORD}
DB_HOST: ${DATABASE_HOST}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
@@ -32,7 +32,7 @@ services:
EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES}
LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase}
POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
WAIT_HOSTS: ${DATABASE_HOST}:${DATABASE_PORT}
WAIT_HOSTS: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}:${DATABASE_PORT}
networks:
- raustriabot
bot:
@@ -41,12 +41,12 @@ services:
- db
- deployment_container
restart: on-failure
container_name: raustriabot
container_name: ${COMPOSE_PROJECT_NAME}_raustriabot
environment:
TOKEN: ${TOKEN}
REMOTE_DEBUG: ${REMOTE_DEBUG}
DB_PASS: ${DATABASE_PASSWORD}
DB_HOST: ${DATABASE_HOST}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
@@ -60,10 +60,10 @@ services:
networks:
- raustriabot
volumes:
- r-austria-bot-bot-logs:/logs
- bot-logs:/logs
- ./config:/config
pgadmin:
container_name: pgadmin
container_name: ${COMPOSE_PROJECT_NAME}_pgadmin
image: ${REGISTRY_PREFIX}r_austria_bot_pg_admin:${R_AUSTRIA_BOT_VERSION}
depends_on:
- db
@@ -76,7 +76,7 @@ services:
networks:
- raustriabot
prometheus:
container_name: prometheus
container_name: ${COMPOSE_PROJECT_NAME}_prometheus
image: ${REGISTRY_PREFIX}r_austria_bot_prometheus:${R_AUSTRIA_BOT_VERSION}
depends_on:
- bot
@@ -87,9 +87,9 @@ services:
- raustriabot
volumes:
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
- r-austria-bot-prometheus-data:/prometheus
- prometheus-data:/prometheus
grafana:
container_name: grafana
container_name: ${COMPOSE_PROJECT_NAME}_grafana
image: ${REGISTRY_PREFIX}r_austria_bot_grafana:${R_AUSTRIA_BOT_VERSION}
depends_on:
- prometheus
@@ -99,31 +99,31 @@ services:
restart: unless-stopped
environment:
DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
DB_HOST: ${DATABASE_HOST}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${GRAFANA_DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
PROMETHEUS_HOST: 'prometheus'
PROMETHEUS_HOST: '${COMPOSE_PROJECT_NAME}_prometheus'
PROMETHEUS_PORT: 9090
LOKI_HOST: 'loki'
LOKI_HOST: '${COMPOSE_PROJECT_NAME}_loki'
LOKI_PORT: ${LOKI_PORT}
volumes:
- r-austria-bot-grafana-user-data:/var/lib/grafana
- grafana-user-data:/var/lib/grafana
networks:
- raustriabot
promtail:
container_name: promtail
container_name: ${COMPOSE_PROJECT_NAME}_promtail
image: ${REGISTRY_PREFIX}r_austria_bot_promtail:${R_AUSTRIA_BOT_VERSION}
depends_on:
- bot
restart: unless-stopped
command: -config.file=/mnt/config/promtail-config.yaml
volumes:
- r-austria-bot-bot-logs:/logs
- bot-logs:/logs
networks:
- raustriabot
loki:
container_name: loki
container_name: ${COMPOSE_PROJECT_NAME}_loki
image: ${REGISTRY_PREFIX}r_austria_bot_loki:${R_AUSTRIA_BOT_VERSION}
depends_on:
- promtail
@@ -140,7 +140,7 @@ networks:
name: raustriabot-network
volumes:
r-austria-bot-db-data:
r-austria-bot-grafana-user-data:
r-austria-bot-prometheus-data:
r-austria-bot-bot-logs:
db-data:
grafana-user-data:
prometheus-data:
bot-logs: