From a3b938f801ca7d376c0a7e08859d54e282ca93ed Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Wed, 3 Jun 2020 20:05:53 +0200
Subject: [PATCH] [MetricsBot] Update to last version and overwrite old
entrypoint
---
pica-metrics-bot/Dockerfile | 6 +++---
pica-metrics-bot/entrypoint.sh | 2 +-
pica-metrics-bot/picasoft-metrics-bot | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pica-metrics-bot/Dockerfile b/pica-metrics-bot/Dockerfile
index b9a90033..ffe75148 100644
--- a/pica-metrics-bot/Dockerfile
+++ b/pica-metrics-bot/Dockerfile
@@ -6,12 +6,12 @@ LABEL maintainer quentinduchemin@tuta.io
COPY picasoft-metrics-bot /code
# Custom Picasoft entrypoint
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+COPY entrypoint.sh /code/entrypoint.sh
+RUN chmod +x /code/entrypoint
WORKDIR /code
# Install dependencies
RUN pip3 install -r requirements.txt
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT [ "/code/entrypoint.sh" ]
diff --git a/pica-metrics-bot/entrypoint.sh b/pica-metrics-bot/entrypoint.sh
index 8f23df0a..911e343e 100644
--- a/pica-metrics-bot/entrypoint.sh
+++ b/pica-metrics-bot/entrypoint.sh
@@ -32,7 +32,7 @@ INTERVAL_SECONDS=${INTERVAL_SECONDS:-60}
while :
do
+ echo "$(date) : Gathering stats..."
python3 main.py
- echo "$(date) : Gathering stats..."
sleep $INTERVAL_SECONDS
done
diff --git a/pica-metrics-bot/picasoft-metrics-bot b/pica-metrics-bot/picasoft-metrics-bot
index 508a84c7..4ccadd2f 160000
--- a/pica-metrics-bot/picasoft-metrics-bot
+++ b/pica-metrics-bot/picasoft-metrics-bot
@@ -1 +1 @@
-Subproject commit 508a84c7332bd95927615b41d067dd78e77d2beb
+Subproject commit 4ccadd2f25cc747ecd27acc74839d5ab51589940
--
GitLab