Skip to content

Commit 4fb648d

Browse files
committed
Merge branch 'develop'
update Dockerfile AND update packagejson
2 parents c42f057 + 76cd529 commit 4fb648d

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# Using a OS
2-
# FROM ubuntu
3-
4-
# MAINTAINER weiqinl <https://github.com/weiqinl>
51
# 从DockerHub拉取一个Node.js的官方Docker镜像,作为我们环境的基础镜像
6-
FROM node:4.2.2
2+
FROM node
3+
4+
#介绍个人联系信息
75
MAINTAINER weiqinl <https://github.com/weiqinl>
6+
7+
#文档的最后更新时间,修改可以清除缓存
8+
ENV REFRESHED_AT 2017-02-10
9+
810
#创建一个位于弄起内部的代码运行文件夹,并将代码复制进去,且通过npm来安装依赖包
911
RUN mkdir -p /usr/src/app
1012
WORKDIR /usr/src/app

blog/credentials.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
cookieSecret: 'mycookieSecret!@#*&*'
3+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"express-session": "^1.9.1",
1616
"file-stream-rotator": "0.0.7",
1717
"jade": "^1.11.0",
18-
"mongodb": "2.0.25",
18+
"mongodb": "2.2.19",
1919
"morgan": "~1.7.0",
2020
"serve-favicon": "~2.3.0"
2121
}

0 commit comments

Comments
 (0)