Skip to content

Commit 816695c

Browse files
authored
Merge pull request #8 from RustyRory/feat/5-docker-compose
feat(mvp): fixes #5 - ci cd
2 parents b25a244 + 7b5e4b5 commit 816695c

6 files changed

Lines changed: 368 additions & 5 deletions

File tree

docs/workflow.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ vps-monitor:
7070
7171
Lancer : `docker-compose up -d vps-monitor`
7272

73+
### Étape 6 — CI CD
74+
75+
76+
7377
---
7478

7579
## Phase 2 — Monitoring HTTP des applications web

vps-monitor-app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules
2+
.env

vps-monitor-app/api/server.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ const path = require('path');
33
const { getContainers } = require('./services/docker');
44

55
const app = express();
6-
const PORT = process.env.PORT || 3000;
6+
7+
const PORT = process.env.PORT;
8+
const URI = process.env.URI;
79

810
app.use(express.static(path.join(__dirname, '../public')));
911

@@ -23,5 +25,5 @@ app.get('/api/status', async (req, res) => {
2325
});
2426

2527
app.listen(PORT, () => {
26-
console.log(`vps-monitor listening on port ${PORT}`);
28+
console.log(`vps-monitor listening on port ${URI}:${PORT}`);
2729
});

vps-monitor-app/api/services/docker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ async function getContainers() {
1212
name: c.Names[0].replace(/^\//, ''),
1313
status: c.State,
1414
image: c.Image,
15-
ports: c.Ports.map((p) =>
15+
ports: [...new Set(c.Ports.map((p) =>
1616
p.PublicPort ? `${p.PublicPort}:${p.PrivatePort}` : `${p.PrivatePort}`
17-
),
17+
))],
1818
uptime: c.Status,
1919
};
2020
});

0 commit comments

Comments
 (0)