Commit f7231d4d authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Modify env monitoring

parent 006d0006

src/monitoring/.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -88,8 +88,9 @@ test monitoring pytest: 
    - if docker container ls | grep influxdb; then docker rm influxdb; fi

  script:

    - docker run --name influxdb -d -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DATABASE -e INFLUXDB_ADMIN_USER=$INFLUXDB_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_PASSWORD -e INXLUXDB_HTTP_AUTH_ENABLED=True --network=teraflowbridge influxdb:1.8

    - docker build --build-arg hostname=influxdb --build-arg user=$INFLUXDB_USER --build-arg pass=$INFLUXDB_PASSWORD --build-arg db=$INFLUXDB_DATABASE -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/

    - docker run --name $IMAGE_NAME_TEST -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge  $IMAGE_NAME_TEST:$IMAGE_TAG

    # - docker build --build-arg hostname=influxdb --build-arg user=$INFLUXDB_USER --build-arg pass=$INFLUXDB_PASSWORD --build-arg db=$INFLUXDB_DATABASE -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/

    - docker build -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/

    - docker run --name $IMAGE_NAME_TEST --env INFLUXDB_USER=$INFLUXDB_USER --env INFLUXDB_PASS=$INFLUXDB_PASSWORD --env INFLUXDB_DB=$INFLUXDB_DATABASE --env INFLUXDB_HOST=influxdb -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge  $IMAGE_NAME_TEST:$IMAGE_TAG

  after_script:

    - docker stop influxdb

    - docker rm influxdb

src/monitoring/tests/Dockerfile

+8 −8
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ COPY monitoring/. monitoring 
COPY common/logger.py common



# define variables for the influxdb

ARG user

ARG pass

ARG db

ARG hostname

ENV INFLUXDB_HOSTNAME=$hostname

ENV INFLUXDB_USER=$user

ENV INFLUXDB_PASSWORD=$pass

ENV INFLUXDB_DATABASE=$db

# ARG user

# ARG pass

# ARG db

# ARG hostname

# ENV INFLUXDB_HOSTNAME=$hostname

# ENV INFLUXDB_USER=$user

# ENV INFLUXDB_PASSWORD=$pass

# ENV INFLUXDB_DATABASE=$db



# set listen port

ENV PORT=7070