Commit 857511c8 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Update monitoring Dockerfile and .gitlab-ci.yml

parent 4e1d0be8

src/monitoring/.gitlab-ci.yml

+26 −26
Original line number Diff line number Diff line 
# build, tag and push the Docker image to the gitlab registry

# build monitoring:

#   variables:

#     IMAGE_NAME: 'monitoring' # name of the microservice

#     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

#   stage: build

#   before_script:

#     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

#   script:

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

#     - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

#     - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

#   after_script:

#     - docker rmi $(docker images --quiet --filter=dangling=true)

#   rules:

#     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

#     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' 

#     - changes:

#       - src/$IMAGE_NAME/**/*.{py,in,yml}

#       - src/$IMAGE_NAME/Dockerfile

#       - src/$IMAGE_NAME/tests/*.py

#       - src/$IMAGE_NAME/tests/Dockerfile

#       - manifests/$IMAGE_NAME.yaml

#       - .gitlab-ci.yml

build monitoring:

  variables:

    IMAGE_NAME: 'monitoring' # name of the microservice

    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

  stage: build

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

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

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  after_script:

    - docker rmi $(docker images --quiet --filter=dangling=true)

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' 

    - changes:

      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAME.yaml

      - .gitlab-ci.yml



build influx:

  stage: build

  script:

    - kubectl version

    - kubectl get all

    # - kubectl delete -f "manifests/monitoring.yaml"

    - kubectl delete -f "manifests/monitoring.yaml"

    # - kubectl delete -f "manifests/influx.yaml"

    # - sleep 60

    # - kubectl get all

    - sleep 60

    - kubectl get all

    - kubectl apply -f "manifests/monitoring.yaml"

    - sleep 60

    - kubectl get all

src/monitoring/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ COPY common/logger.py . 
ENV PORT=7070

EXPOSE 7070



ENTRYPOINT ["python", "/monitoring/monitoring_server.py"]
 
ENTRYPOINT ["python", "/service/monitoring_server.py"]

src/monitoring/requirements.in

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ numpy 
prometheus-client

pytest

pytest-benchmark

influxdb