From 9b419f3a7ce1755e12234f63655f2d552a961a28 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 23 Mar 2020 11:56:14 +0200 Subject: [PATCH] Updated docker compose files --- data/docker/scratch/cgr-engine.yaml | 5 +---- data/docker/scratch/cgr-loader.yaml | 9 ++++----- data/docker/scratch/cgr-migrator.yaml | 4 +--- data/docker/scratch/cgr-tester.yaml | 4 +--- packages/debian/changelog | 2 ++ 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/data/docker/scratch/cgr-engine.yaml b/data/docker/scratch/cgr-engine.yaml index 1abad3934..e79511b8f 100644 --- a/data/docker/scratch/cgr-engine.yaml +++ b/data/docker/scratch/cgr-engine.yaml @@ -10,12 +10,9 @@ services: ports: - 2012:2012 - 2080:2080 - volumes: - - ../../conf/samples/docker/:/etc/cgrates/:ro - - ../../tariffplans/tutorial/:/data/:ro environment: - DOCKER_IP=0.0.0.0 - command: /cgr-engine --logger=*stdout -httprof_path=/pprof + command: /cgr-engine --logger=*stdout -httprof_path=/pprof -config_path=https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/docker/cgrates.json redis: image: redis diff --git a/data/docker/scratch/cgr-loader.yaml b/data/docker/scratch/cgr-loader.yaml index 22de72450..0e621de2a 100644 --- a/data/docker/scratch/cgr-loader.yaml +++ b/data/docker/scratch/cgr-loader.yaml @@ -3,15 +3,14 @@ services: cgr-loader: image: dkr.cgrates.org/nightly/cgr-loader container_name: cgr-loader - volumes: - - ../../conf/samples/docker/:/etc/cgrates/:ro - - ../../tariffplans/tutorial/:/data/:ro environment: - DOCKER_IP=cgr-engine - command: /cgr-loader -config_path=/etc/cgrates/ -path=/data/ -caches_address="conn1" -scheduler_address="conn1" -verbose + stdin_open: true + tty: true + command: /cgr-loader -config_path=https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/docker/cgrates.json -path=https://raw.githubusercontent.com/cgrates/cgrates/master/data/tariffplans/tutorial/ -caches_address="conn1" -scheduler_address="conn1" -verbose networks: default: external: name: cgrates-net -# sudo docker-compose -f cgr-loader.yaml up +# sudo docker-compose -f cgr-loader.yaml run --rm cgr-loader diff --git a/data/docker/scratch/cgr-migrator.yaml b/data/docker/scratch/cgr-migrator.yaml index cb7395ec5..21f01d321 100644 --- a/data/docker/scratch/cgr-migrator.yaml +++ b/data/docker/scratch/cgr-migrator.yaml @@ -3,11 +3,9 @@ services: cgr-migrator: image: dkr.cgrates.org/nightly/cgr-migrator container_name: cgr-migrator - volumes: - - ../../conf/samples/docker/:/etc/cgrates/:ro environment: - DOCKER_IP=cgr-engine - command: /cgr-migrator -config_path=/etc/cgrates/ --exec=*set_versions + command: /cgr-migrator -config_path=https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/docker/cgrates.json --exec=*set_versions networks: default: external: diff --git a/data/docker/scratch/cgr-tester.yaml b/data/docker/scratch/cgr-tester.yaml index 710d61d62..e65de2f30 100644 --- a/data/docker/scratch/cgr-tester.yaml +++ b/data/docker/scratch/cgr-tester.yaml @@ -3,11 +3,9 @@ services: cgr-tester: image: dkr.cgrates.org/nightly/cgr-tester container_name: cgr-tester - volumes: - - ../../conf/samples/docker/:/etc/cgrates/:ro environment: - DOCKER_IP=cgr-engine - command: /cgr-tester -config_path=/etc/cgrates/ + command: /cgr-tester -config_path=https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/docker/cgrates.json networks: default: external: diff --git a/packages/debian/changelog b/packages/debian/changelog index 5e16777c3..619dfd5dc 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -34,6 +34,8 @@ cgrates (0.11.0~dev) UNRELEASED; urgency=medium * [Migrator] Auto discover tenant from key instead of taking it from config * [Templates] Fixed missing "*" for strip and pading strategy * [DiameterAgent] Added RAR support + * [Loader] Added support to load CSV files from URL + * [Loader] Added configurable gapi_credentials -- Alexandru Tripon Wed, 19 Feb 2020 13:25:52 +0200