Commit e36a6b52 authored by Florent Peterschmitt's avatar Florent Peterschmitt

fix(ci): change CANOPSIS_TAG variable for docker-compose to CANOPSIS_IMAGE_TAG

parent 219f4752
Pipeline #2735 failed with stage
in 2 seconds
RABBIT_TAG=2.4
INFLUX_TAG=2.4
MONGO_TAG=2.5
CANOPSIS_TAG=develop
CANOPSIS_IMAGE_TAG=develop
......@@ -21,14 +21,7 @@ stage_test:
stage: test
tags: ["canopsis"]
script:
- git submodule update --init
- ./build-docker.sh
- echo CANOPSIS_TAG=${CANOPSIS_DISTRIBUTION}-ci-test >> .env
- docker-compose -f docker-compose.ci.yml -p ${COMPOSE_PROJECT_NAME} up -d
- ./docker/wait-provisionning.sh docker-compose.ci.yml ${COMPOSE_PROJECT_NAME}
- docker-compose -f docker-compose.ci.yml -p ${COMPOSE_PROJECT_NAME} restart
- docker exec -t ${COMPOSE_PROJECT_NAME}_webserver_1 /bin/bash -c "source ~/.bashrc && /opt/canopsis/bin/ut_runner /opt/canopsis/test"
- docker cp ${COMPOSE_PROJECT_NAME}_webserver_1:/opt/canopsis/tmp/tests_report/ tests_report
- ci-gitlab.sh
artifacts:
paths:
......
#!/usr/bin/env bash
set -e
set -o pipefail
set -u
git submodule update --init
./build-docker.sh
# override .env default variable
export CANOPSIS_IMAGE_TAG=${CANOPSIS_DISTRIBUTION}-ci-test
docker-compose -f docker-compose.ci.yml -p ${COMPOSE_PROJECT_NAME} up -d
./docker/wait-provisionning.sh docker-compose.ci.yml ${COMPOSE_PROJECT_NAME}
docker-compose -f docker-compose.ci.yml -p ${COMPOSE_PROJECT_NAME} restart
docker exec -t ${COMPOSE_PROJECT_NAME}_webserver_1 /bin/bash -c "source ~/.bashrc && /opt/canopsis/bin/ut_runner /opt/canopsis/test"
docker cp ${COMPOSE_PROJECT_NAME}_webserver_1:/opt/canopsis/tmp/tests_report/ tests_report
......@@ -23,8 +23,6 @@ services:
mongodb:
image: mongo:3.6-jessie
env_file: compose.mongo.env
ports:
- "27027:27017"
volumes:
- mongodbdata:/data/db
- dumpdata:/dump/dumpdata
......@@ -36,10 +34,6 @@ services:
command: '--wiredTigerCacheSizeGB 2560'
influxdb:
image: influxdb:1.5-alpine
ports:
- "8086:8086"
- "4444:4444/udp"
- "8083:8083"
restart: unless-stopped
mem_limit: 1g
mem_reservation: 1g
......@@ -53,14 +47,14 @@ services:
volumes:
- influxdbdata:/var/lib/influxdb
provisionning:
image: canopsis/canopsis-prov:${CANOPSIS_TAG}
image: canopsis/canopsis-prov:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
- "mongodb"
restart: "no"
cleaner_events:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -73,7 +67,7 @@ services:
mem_reservation: 200m
#entrypoint: ["/usr/bin/tail", "-F", "/dev/null"]
event_filter:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -85,7 +79,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
pbehavior:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -97,7 +91,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
ticket:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -109,7 +103,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
eventstore:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -121,7 +115,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
context-graph:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -133,7 +127,7 @@ services:
mem_limit: 2g
mem_reservation: 2g
linklist:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -145,7 +139,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
alerts:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -157,7 +151,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
scheduler:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -169,7 +163,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_mail:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -181,7 +175,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_linklist:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -193,7 +187,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_importctx:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -207,7 +201,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
webserver:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
environment:
......
......@@ -62,14 +62,14 @@ services:
ports:
- 6379:6379
provisionning:
image: canopsis/canopsis-prov:${CANOPSIS_TAG}
image: canopsis/canopsis-prov:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
- "mongodb"
restart: "no"
cleaner_events:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -81,7 +81,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
event_filter:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -93,7 +93,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
pbehavior:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -105,7 +105,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
ticket:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -117,7 +117,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
eventstore:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -129,7 +129,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
context-graph:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -141,7 +141,7 @@ services:
mem_limit: 2g
mem_reservation: 2g
linklist:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -153,7 +153,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
alerts:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -165,7 +165,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
scheduler:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -177,7 +177,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_mail:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -189,7 +189,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_linklist:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -201,7 +201,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
task_importctx:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -215,7 +215,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
metric:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
depends_on:
......@@ -227,7 +227,7 @@ services:
mem_limit: 200m
mem_reservation: 200m
webserver:
image: canopsis/canopsis-core:${CANOPSIS_TAG}
image: canopsis/canopsis-core:${CANOPSIS_IMAGE_TAG}
env_file:
- compose.env
environment:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment