From b7e19d61b05033e0518aa15811d2218f0c573955 Mon Sep 17 00:00:00 2001 From: Me Date: Sat, 14 Mar 2020 17:41:15 +0100 Subject: [PATCH] Liman to dst --- .gitmodules | 3 +++ docker-compose.yml | 6 +++--- dst | 1 + liman/Dockerfile | 7 ------- liman/healthcheck.js | 25 ------------------------- 5 files changed, 7 insertions(+), 35 deletions(-) create mode 100644 .gitmodules create mode 160000 dst delete mode 100644 liman/Dockerfile delete mode 100644 liman/healthcheck.js diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ec82ad5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dst"] + path = dst + url = https://git.wadza.fr/me/dst.git diff --git a/docker-compose.yml b/docker-compose.yml index b1215ab..6c0679e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: build: context: gotify - liman: - image: local/liman + dst: + image: local/dst build: - context: liman \ No newline at end of file + context: dst \ No newline at end of file diff --git a/dst b/dst new file mode 160000 index 0000000..a9721d6 --- /dev/null +++ b/dst @@ -0,0 +1 @@ +Subproject commit a9721d695cbf6e9b6884c1ae77e3c2a3bb7b022e diff --git a/liman/Dockerfile b/liman/Dockerfile deleted file mode 100644 index 543673b..0000000 --- a/liman/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM salihciftci/liman - -COPY ./healthcheck.js / - -RUN chmod a+x /healthcheck.js - -HEALTHCHECK CMD node /healthcheck.js diff --git a/liman/healthcheck.js b/liman/healthcheck.js deleted file mode 100644 index 1fac5d7..0000000 --- a/liman/healthcheck.js +++ /dev/null @@ -1,25 +0,0 @@ -var http = require("http"); - -var options = { - host: "localhost", - port: "5000", - path: "/login", - timeout: 2000 -}; - -var request = http.request(options, (res) => { - if (res.statusCode == 200) { - process.exit(0); - } - else { - console.log(`STATUS: ${res.statusCode}`); - process.exit(1); - } -}); - -request.on('error', function (err) { - console.log('ERROR', err); - process.exit(1); -}); - -request.end(); \ No newline at end of file