From a823fafc09a1cacc0e5210a6d41ab883a121abce Mon Sep 17 00:00:00 2001 From: Hansoo Date: Sun, 29 Aug 2021 20:18:54 +0900 Subject: [PATCH] some fix --- Dockerfile | 6 +++--- main-web/server/package.json | 2 +- main-web/server/src/index.ts | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2492720..18d5d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,13 @@ COPY . . RUN ["./build_script.sh"] -FROM node:14 +FROM arm32v7/node:14 WORKDIR /usr/src/app COPY --from=0 /tmp/build . - +RUN apt-get update && apt install mariadb-client -y RUN npm install -EXPOSE 8080 +EXPOSE 4000 CMD [ "node", "server/index.js" ] \ No newline at end of file diff --git a/main-web/server/package.json b/main-web/server/package.json index dd3ff2c..51a5538 100644 --- a/main-web/server/package.json +++ b/main-web/server/package.json @@ -4,7 +4,7 @@ "description": "", "main": "src/index.ts", "scripts": { - "start": "ts-node-dev --respawn --transpileOnly ./src/index.ts", + "start": "ts-node-dev --poll --respawn --transpile-only ./src/index.ts", "build": "tsc --resolveJsonModule", "test": "ts-node-dev src/test.ts", "lint": "tslint -c tslint.json -p tsconfig.json" diff --git a/main-web/server/src/index.ts b/main-web/server/src/index.ts index 1065b5b..34e6057 100644 --- a/main-web/server/src/index.ts +++ b/main-web/server/src/index.ts @@ -10,7 +10,7 @@ import { IJankenSelect, IJankenResult } from './models/message'; import { IRoom } from './models'; dotenv.config(); -const port: number = 8080; +const port: number = 4000; const app: express.Express = express(); const httpServer: http.Server = http.createServer(app); const io: socketIo.Server = socketIo(httpServer); @@ -24,7 +24,8 @@ const connection = mysql.createPool({ host: process.env.DB_ENDPOINT, user: process.env.DB_USER, password: process.env.DB_PASS, - database: 'catherine_league' + database: 'catherine_league', + charset: 'utf8mb4' }); connection.query( `SELECT id, tournament_key