From e0f77371dbbb33af8d207df212008648d71b05be Mon Sep 17 00:00:00 2001 From: F04C Date: Fri, 27 Sep 2024 15:54:21 +0800 Subject: [PATCH] removed unecessary files and transferred Dockerfile outside /app --- app/.dockerignore => .dockerignore | 0 app/Dockerfile => Dockerfile | 0 app/api/routes/popcenCount.js | 2 +- entrypoint.sh | 7 ------- portainer.yml | 2 +- 5 files changed, 2 insertions(+), 9 deletions(-) rename app/.dockerignore => .dockerignore (100%) rename app/Dockerfile => Dockerfile (100%) delete mode 100644 entrypoint.sh diff --git a/app/.dockerignore b/.dockerignore similarity index 100% rename from app/.dockerignore rename to .dockerignore diff --git a/app/Dockerfile b/Dockerfile similarity index 100% rename from app/Dockerfile rename to Dockerfile diff --git a/app/api/routes/popcenCount.js b/app/api/routes/popcenCount.js index c9ea4c3..52c2490 100644 --- a/app/api/routes/popcenCount.js +++ b/app/api/routes/popcenCount.js @@ -5,7 +5,7 @@ const verifyToken = require("../../middlewares/authMiddleware"); router.get("/", verifyToken, (req, res) => { const caseidPattern = req.query.caseidPattern + "%"; - const sql = "SELECT COUNT(id) FROM popcen2024_capi.CBMS2024_DICT WHERE caseids LIKE ?"; + const sql = "SELECT COUNT(id) as 'count' FROM popcen2024_capi.CBMS2024_DICT WHERE caseids LIKE ?"; dataDb.query(sql, [caseidPattern], (err, results) => { if (err) { diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 5bf37be..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -cd /usr/src/app - -npm install - -npm start diff --git a/portainer.yml b/portainer.yml index 3bd3b3e..0b737cf 100644 --- a/portainer.yml +++ b/portainer.yml @@ -30,7 +30,7 @@ services: ports: - "3306:3306" volumes: - - D:/Projects/AuthenticatedAPIDocker/app/mysql/mysqldata:/var/lib/mysql + - D:/Projects/AuthenticatedAPIDocker/mysql/mysqldata:/var/lib/mysql extra_hosts: - "host.docker.internal:host-gateway" healthcheck: