Merge branch 'master' of gitlab.com:grafolean/grafolean-collector-ping

Author: Anze

.gitlab-ci.yml

@@ -33,6 +33,6 @@ deploy_to_docker_hub:
     - docker build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -t "$CI_REGISTRY_IMAGE:latest" --build-arg VERSION=$CI_COMMIT_TAG --build-arg VCS_REF=$CI_COMMIT_SHA --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
     - docker push "$CI_REGISTRY_IMAGE:latest"
-    - docker rmi grafolean/grafolean-worker-ping:$CI_COMMIT_TAG
-    - docker rmi grafolean/grafolean-worker-ping:latest
+    - docker rmi grafolean/grafolean-collector-ping:$CI_COMMIT_TAG
+    - docker rmi grafolean/grafolean-collector-ping:latest
 

Dockerfile

@@ -1,8 +1,36 @@
-FROM python:3.6-alpine
+FROM python:3.6-slim-stretch as python-requirements
+COPY ./Pipfile ./Pipfile.lock /pingcollector/
+WORKDIR /pingcollector
+RUN \
+    pip install pipenv && \
+    pipenv lock -r > /requirements.txt
 
-COPY requirements.txt grafolean-worker-ping.py /opt/
-RUN pip install -r /opt/requirements.txt
-RUN echo -e "* * * * * source /etc/environment; export BACKEND_URL BOT_TOKEN; python /opt/grafolean-worker-ping.py > /proc/1/fd/1 2> /proc/1/fd/2\n" > /etc/crontabs/root
+FROM python:3.6-slim-stretch as build-backend
+COPY ./ /pingcollector/
+WORKDIR /pingcollector
+RUN \
+    find ./ ! -name '*.py' -type f -exec rm '{}' ';' && \
+    rm -rf tests/ .vscode/ .pytest_cache/ __pycache__/ && \
+    python3.6 -m compileall -b ./ && \
+    find ./ -name '*.py' -exec rm '{}' ';'
 
-# https://stackoverflow.com/a/47960145/593487
-ENTRYPOINT ["crond", "-f", "-d", "8"]
+
+FROM python:3.6-slim-stretch
+ARG VERSION
+ARG VCS_REF
+ARG BUILD_DATE
+LABEL org.label-schema.vendor="Grafolean" \
+      org.label-schema.url="https://grafolean.com/" \
+      org.label-schema.name="Grafolean Ping Collector" \
+      org.label-schema.description="Ping collector for Grafolean" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.vcs-url="https://gitlab.com/grafolean/grafolean-collector-ping/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.docker.schema-version="1.0"
+COPY --from=python-requirements /requirements.txt /requirements.txt
+RUN pip install --no-cache-dir -r /requirements.txt
+COPY --from=build-backend /pingcollector/ /pingcollector/
+WORKDIR /pingcollector
+USER root
+CMD ["python", "-m", "pingcollector"]

Pipfile.lock

@@ -5,12 +5,22 @@ services:
   # BACKEND_URL=...   # backend API base url (the part before "/api/...")
   # BOT_TOKEN=...     # bot token
 
-  grafolean-worker-ping:
+  grafolean-collector-ping:
     # If you wish to load an explicit version, change the next line. For example:
-    #   image: grafolean/grafolean-worker-ping:v1.0.0
-    image: grafolean/grafolean-worker-ping
+    #   image: grafolean/grafolean-collector-ping:v1.0.0
+    image: grafolean/grafolean-collector-ping
+    container_name: grafolean-collector-ping
     build:
       context: .
       dockerfile: Dockerfile
-    volumes:
-      - .env:/etc/environment
+    environment:
+      # Backend url must be set to the address of the Grafolean backend, for example this uses Grafolean hosted service:
+      # - BACKEND_URL=https://grafolean.com/api
+      # IMPORTANT: '127.0.0.1' and 'localhost' are _never_ correct addresses for Grafolean backend, because they translate
+      # to container, not host.
+      - BACKEND_URL=${BACKEND_URL}
+      # To use PING Collector, a bot with the protocol "ping" must be added via user interface, then the token needs to be copied here:
+      - BOT_TOKEN=${BOT_TOKEN}
+      # Interval between fetching information about jobs:
+      - JOBS_REFRESH_INTERVAL=${JOBS_REFRESH_INTERVAL:-60}
+    restart: always

docker-compose.yml

@@ -4,7 +4,6 @@
 from colors import color
 import logging
 from multiping import multi_ping
-from pytz import utc
 import requests
 import socket
 import dotenv