summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorVictor Näslund <victor@sunet.se>2022-11-13 17:49:45 +0100
committerVictor Näslund <victor@sunet.se>2022-11-13 17:49:45 +0100
commit563607809d993c9e496423829b1f93def22a4aac (patch)
tree6d7f3b7dc9466fa70750c67a661751f9d1fffa56 /data
parent60029b36e9bdd773be923a3cd7d5d30170c669b3 (diff)
more stuff
Diffstat (limited to 'data')
-rw-r--r--data/collector_container/Dockerfile4
-rw-r--r--data/init-mongodb.js4
-rwxr-xr-xdata/mongodb_entrypoint.sh2
3 files changed, 8 insertions, 2 deletions
diff --git a/data/collector_container/Dockerfile b/data/collector_container/Dockerfile
index e02a5d2..a9bb4e5 100644
--- a/data/collector_container/Dockerfile
+++ b/data/collector_container/Dockerfile
@@ -29,6 +29,10 @@ WORKDIR /app/
USER collector
+# Add healthcheck
+HEALTHCHECK --interval=30s --timeout=15s --retries=1 --start-period=30s \
+ CMD sh healthcheck.sh || bash -c 'kill -s 15 1 && (sleep 7; kill -s 9 1)'
+
ENTRYPOINT ["uvicorn", "src.collector.main:app", "--host", "0.0.0.0", "--workers", "1", "--header", "server:collector"]
diff --git a/data/init-mongodb.js b/data/init-mongodb.js
index 4b64674..6057d84 100644
--- a/data/init-mongodb.js
+++ b/data/init-mongodb.js
@@ -4,7 +4,7 @@
disableTelemetry()
// Create the DB by inserting some data
-db.v0.insertOne({init_key: "init_data"})
+db.REPLACE_COLLECTION.insertOne({init_key: "init_data"})
// Create user
db.createUser(
@@ -21,7 +21,7 @@ db.createUser(
)
// Delete the init data
-db.v0.deleteOne({init_key: "init_data"})
+db.REPLACE_COLLECTION.deleteOne({init_key: "init_data"})
// Disable the ad about monitoring
db.disableFreeMonitoring()
diff --git a/data/mongodb_entrypoint.sh b/data/mongodb_entrypoint.sh
index 3db507a..7a81abc 100755
--- a/data/mongodb_entrypoint.sh
+++ b/data/mongodb_entrypoint.sh
@@ -8,7 +8,9 @@ then
cp /init-mongodb.js /data/db/init-mongodb.js
sed -i "s/REPLACE_USERNAME/$MONGODB_USERNAME/g" /data/db/init-mongodb.js
sed -i "s/REPLACE_PASSWORD/$MONGODB_PASSWORD/g" /data/db/init-mongodb.js
+ sed -i "s/REPLACE_COLLECTION/$MONGODB_COLLECTION/g" /data/db/init-mongodb.js
+ # Update and shutdown our DB with changes
/usr/bin/mongosh localhost:27015/production /data/db/init-mongodb.js
sleep 1 # Allow DB to shutdown
/usr/bin/touch /data/db/user_exist