Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ RUN mkdir -p /usr/src/nodejs/
WORKDIR /usr/src/nodejs/

# RUN/COPY是分层的,package.json 提前,只要没修改就不会重新安装包
COPY package.json /usr/src/app/package.json
RUN cd /usr/src/app/
RUN npm i
COPY package.json yarn.lock /usr/src/nodejs/
RUN cd /usr/src/nodejs/
RUN yarn install && yarn cache clean

# 把当前目录下所有的文件拷贝到 Image 的 /usr/src/nodejs/目录下
COPY . /usr/src/nodejs/

EXPOSE 30010
CMD npm start
EXPOSE 3000
CMD npm start
14 changes: 14 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: '2'
services:
webapp:
build: .
image: webapp:dockerstudy
volumes:
- ./:/usr/src/nodejs
#depends_on:
#- mongo
ports:
- 3000:3000
container_name: dockerstudycontainer
#mongo:
#image: "mongo:latest"
35 changes: 27 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"koa-static": "^3.0.0",
"koa-views": "^5.2.1",
"mongoose": "^5.8.1",
"pug": "^2.0.0-rc.1"
"pug": "^2.0.0-rc.1",
"uuid": "^7.0.3"
},
"devDependencies": {
"nodemon": "^1.8.1"
Expand Down
2 changes: 1 addition & 1 deletion routes/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use strict'
const router = require('koa-router')()
const User = require('../models/user')
// 用于封装controllers的公共方法

var mongoose = require('mongoose')
var uuid = require('uuid')

router.get('/', async (ctx, next) => {
// 向mongodb中添加一条数据
const User = mongoose.model('User')
const user = await User.findOne({
phoneNumber: '16677771234'
}).exec()
Expand Down