From 4a2c6a9d654f79110aaab91fed86225df4e13d44 Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Sun, 12 Jun 2022 20:51:07 +0900 Subject: [PATCH 1/7] Test deploy2 --- nodeServer/src/routes/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodeServer/src/routes/index.ts b/nodeServer/src/routes/index.ts index 7a83378..6653f27 100644 --- a/nodeServer/src/routes/index.ts +++ b/nodeServer/src/routes/index.ts @@ -10,7 +10,7 @@ const router = express.Router(); router.get('/test', (req,res)=>{ res.sendStatus(200); }); -router.get('/deploy-test1', (req,res) => { +router.get('/deploy-test2', (req,res) => { res.sendStatus(200); }) From a4e6acd1dc610c6b7f2ba610e55f6d26b200c158 Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Sun, 12 Jun 2022 20:53:24 +0900 Subject: [PATCH 2/7] MODIFY github action path --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index aefe155..a600b34 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,6 +24,6 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: cd helloPlantNodeServer + - run: cd nodeServer - run: npm install - run: npm dev From f2c2a98ca2b64c75d6e195629260bb55b9bb67b9 Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Tue, 14 Jun 2022 16:13:30 +0900 Subject: [PATCH 3/7] FIX README and swagger docs --- README.md | 15 ++------------- nodeServer/build/swagger.yaml | 2 +- nodeServer/src/db/index.ts | 2 -- nodeServer/src/routes/index.ts | 2 +- nodeServer/src/swagger/openapi.yaml | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 49c24e8..b4eb589 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,8 @@ # helloPlantNodeServer -api-doc : http://18.116.203.236:1234/api-docs/ +api-doc : http://3.12.148.142/api-docs/ ## Scripts -### `npm start` - -Non-disruptive deployment to the server using pm2 - -### `npm run dev` - -You can test it at the time of development using nodemon. - -### `npm run api-docs` - -You can just fix api-docs
-this script runs before `npm start` and `npm run dev` +### `docker-compose up` diff --git a/nodeServer/build/swagger.yaml b/nodeServer/build/swagger.yaml index a1a36e8..3eaccac 100644 --- a/nodeServer/build/swagger.yaml +++ b/nodeServer/build/swagger.yaml @@ -5,7 +5,7 @@ info: title: HelloPlant api contact: email: qwerq123456@snu.ac.kr -basePath: '/18.116.203.236:1234' +basePath: /3.12.148.142/ schemes: - http tags: diff --git a/nodeServer/src/db/index.ts b/nodeServer/src/db/index.ts index 3d701fe..1ffc502 100644 --- a/nodeServer/src/db/index.ts +++ b/nodeServer/src/db/index.ts @@ -5,8 +5,6 @@ dotenv.config(); mongoose.connect( "mongodb://my-username:my-root-password@mongo:27017" - // process.env.DB_URL as string, - // "mongodb+srv://qwerq123456:rudghks123@cluster0.nyhkg.mongodb.net/myFirstDatabase?retryWrites=true&w=majority" ); const db = mongoose.connection; diff --git a/nodeServer/src/routes/index.ts b/nodeServer/src/routes/index.ts index 7a83378..0574a71 100644 --- a/nodeServer/src/routes/index.ts +++ b/nodeServer/src/routes/index.ts @@ -10,7 +10,7 @@ const router = express.Router(); router.get('/test', (req,res)=>{ res.sendStatus(200); }); -router.get('/deploy-test1', (req,res) => { +router.get('/deploy-test3', (req,res) => { res.sendStatus(200); }) diff --git a/nodeServer/src/swagger/openapi.yaml b/nodeServer/src/swagger/openapi.yaml index ddec9b7..3bdd165 100644 --- a/nodeServer/src/swagger/openapi.yaml +++ b/nodeServer/src/swagger/openapi.yaml @@ -7,7 +7,7 @@ info: # put the contact info for your development or API team contact: email: qwerq123456@snu.ac.kr -basePath: /18.116.203.236:1234 +basePath: /3.12.148.142/ schemes: - http From 04b5e3c91698fe3c20882d1f81a76547029e7e9f Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Tue, 14 Jun 2022 16:20:00 +0900 Subject: [PATCH 4/7] MODIFY github action workflows --- .github/workflows/node.js.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index a600b34..64aee7f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,6 +24,5 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: cd nodeServer - - run: npm install - - run: npm dev + - run: npm install --prefix ./nodeServer + - run: npm dev --prefix ./nodeServer From b5a0f050bc60107e2ab6f9893b63481c966719a9 Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Tue, 14 Jun 2022 16:21:06 +0900 Subject: [PATCH 5/7] MODIFY github action workflows --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 64aee7f..0c6861a 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,4 +25,4 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - run: npm install --prefix ./nodeServer - - run: npm dev --prefix ./nodeServer + - run: npm run dev --prefix ./nodeServer From 22c74cc755def56f86cf4665628f592365d740fc Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Tue, 14 Jun 2022 16:50:12 +0900 Subject: [PATCH 6/7] MODIFY codes to use .env and github secret --- .github/workflows/node.js.yml | 14 ++++++++++++-- nodeServer/docker-compose.yml | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 0c6861a..eb86a88 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,5 +24,15 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: npm install --prefix ./nodeServer - - run: npm run dev --prefix ./nodeServer + - run: | + echo "PORT=$PORT" >> .env + echo "JWT_SECRET=$JWT_SECRET" >> .env + echo "NODEMAILER_USER=$NODEMAILER_USER" >> .env + echo "NODEMAILER_PASSWORD=$NODEMAILER_PASSWORD" >> .env + npm install --prefix ./nodeServer + npm run dev --prefix ./nodeServer + env : + PORT: ${{ secrets.PORT }} + JWT_SECRET: ${{ secrets.JWT_SECRET }} + NODEMAILER_USER: ${{ secrets.NODEMAILER_USER }} + NODEMAILER_PASSWORD: ${{ secrets.NODEMAILER_PASSWORD }} diff --git a/nodeServer/docker-compose.yml b/nodeServer/docker-compose.yml index fa75eb3..5e38922 100644 --- a/nodeServer/docker-compose.yml +++ b/nodeServer/docker-compose.yml @@ -18,8 +18,8 @@ services: image: mongo restart : always environment : - - MONGO_INITDB_ROOT_USERNAME=my-username - - MONGO_INITDB_ROOT_PASSWORD=my-root-password + - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} + - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} ports: - "27017:27017" volumes : From aa944c58c43836c1fcdc58ca58b704090899333b Mon Sep 17 00:00:00 2001 From: qwerq123456 Date: Tue, 14 Jun 2022 16:58:03 +0900 Subject: [PATCH 7/7] ADD DB_URL to secrets --- .github/workflows/node.js.yml | 2 ++ nodeServer/src/app.ts | 2 -- nodeServer/src/db/index.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index eb86a88..e982fa4 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -29,6 +29,7 @@ jobs: echo "JWT_SECRET=$JWT_SECRET" >> .env echo "NODEMAILER_USER=$NODEMAILER_USER" >> .env echo "NODEMAILER_PASSWORD=$NODEMAILER_PASSWORD" >> .env + echo "DB_URL=$DB_URL" >> .env npm install --prefix ./nodeServer npm run dev --prefix ./nodeServer env : @@ -36,3 +37,4 @@ jobs: JWT_SECRET: ${{ secrets.JWT_SECRET }} NODEMAILER_USER: ${{ secrets.NODEMAILER_USER }} NODEMAILER_PASSWORD: ${{ secrets.NODEMAILER_PASSWORD }} + DB_URL: ${{ secrets.DB_URL }} diff --git a/nodeServer/src/app.ts b/nodeServer/src/app.ts index c4a6d1a..cc9ec99 100644 --- a/nodeServer/src/app.ts +++ b/nodeServer/src/app.ts @@ -19,7 +19,6 @@ app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec)) app.use(session({ - // todo : put it in .env secret: 'secret', resave: false, saveUninitialized: true, @@ -43,7 +42,6 @@ app.use(passport.initialize()); app.use('/', router); -// todo : put port in .env app.listen('5000', () => { console.log(` ################################################ diff --git a/nodeServer/src/db/index.ts b/nodeServer/src/db/index.ts index 1ffc502..30afecf 100644 --- a/nodeServer/src/db/index.ts +++ b/nodeServer/src/db/index.ts @@ -2,9 +2,9 @@ import mongoose from 'mongoose'; import dotenv from 'dotenv'; dotenv.config(); - +const DB_URL = process.env.DB_URL as string; mongoose.connect( - "mongodb://my-username:my-root-password@mongo:27017" + DB_URL ); const db = mongoose.connection;