feat: docker support #38

thonatos · 2018-03-06T17:55:32Z

Checklist

npm test passes
tests and/or benchmarks are included
documentation is changed or added
commit message follows commit guidelines

Affected core subsystem(s)

package.json

Description of change

add script to bootstrap egg without deamon
add dockerfile
add docker-compose file to start egg with redis and mongodb
update config.local.js with mongo/redis

codecov · 2018-03-06T17:57:36Z

Codecov Report

Merging #38 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master      #38   +/-   ##
=======================================
  Coverage   59.17%   59.17%           
=======================================
  Files          34       33    -1     
  Lines         926      926           
=======================================
  Hits          548      548           
  Misses        378      378

Impacted Files	Coverage Δ
config/config.default.js	`100% <100%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e3304c4...cf796ee. Read the comment docs.

atian25 · 2018-03-07T00:32:28Z

config/config.prod.js

+
+exports.redis = {
+  client: {
+    host: process.env.EGG_REDIS_HOST || '127.0.0.1',


有 prod 的话，unittest 和 local 里面的配置，可以考虑写到 default 去

不过都有环境变量了，那是不是 prod 也不需要了

还是不要搞那么多环境变量吧，弄个配置文件更好。

这边的加 prod 的原因写在 Dockerfile 的 review 里了

issue #28 讨论吧

atian25 · 2018-03-07T00:34:17Z

init.d/mongo/init.js

+})
+
+db.egg_cnode.insert({
+  'cnode': 'egg-cnode'


cnode 没有 ''

这个文件可以不用 ignore 掉 eslint 的，在顶部加一句注释，加个 /* global db */ 就 ok 了

👌，加了 /* eslint-disable */

atian25 · 2018-03-07T00:36:53Z

Dockerfile

+
+# RUN npm i --production
+
+RUN npm i --production --registry=https://registry.npm.taobao.org


我的想法是，本地开发给一个 docker 来启动数据库等环境，本地应该不需要在 docker 里面复制源码和 npm

唔，感觉可以加一个 compose 配置：

docker-compose.yml 启动一个基本和正式环境完全一致的服务（egg/redis/mongo）

docker-compose-dev.yml 启动数据库等

我觉得 docker 支持作为另一个 repo 吧。

我现在的需求很简单，要提供开发期支持，不然本地 egg-bin test 的时候，要自己启动 redis 和 mongo

部署这个暂时不关心

加了一个 docker-compose.dev.yml 来启动数据库

atian25 · 2018-03-07T10:46:34Z

rebase

thonatos · 2018-03-07T15:58:49Z

@atian25 唔，配置这边有点改动，
使用 docker 启动的 redis/mongo 加了认证，同时改变了数据库名称，统一使用 egg_cnode 了

…g-cnode into feature-docker

JacksonTian · 2018-03-08T10:50:24Z

没有rebase 对吧。

…g-cnode into feature-docker

config.prod.js has been removed.

thonatos added 7 commits March 7, 2018 01:50

feat: add docker support

030a408

feat: add config for prod

96d31ef

chore: bootstrap egg without deamon

d89a8ce

feat: add mongo init script

50bc95c

chore: ignore mongo script from eslint

2992ea8

docs: develop with docker

4ff8e76

style: restyle

1107e5f

thonatos mentioned this pull request Mar 6, 2018

本地开发说明 #28

Closed

2 tasks

atian25 previously requested changes Mar 7, 2018

View reviewed changes

thonatos added 5 commits March 7, 2018 10:01

chore: restore eslint conf & ignore by comments

6524298

fix: fix err path

66f7633

feat: add compose for dev

d5d32e1

chore: use docker db

4e20c39

docs: update dev with docker

1f017f0

thonatos added 13 commits March 7, 2018 23:51

feat: add docker support

6a59bda

feat: add config for prod

bc8ef3c

chore: bootstrap egg without deamon

e6333a6

feat: add mongo init script

3b3b025

chore: ignore mongo script from eslint

98f74c8

docs: develop with docker

cffd1f9

style: restyle

4c2bf8e

chore: restore eslint conf & ignore by comments

437096d

fix: fix err path

79c6838

feat: add compose for dev

b59e8ec

chore: use docker db

a7b41c1

docs: update dev with docker

174bffb

chore: merge branch 'feature-docker'

9d84299

thonatos added 9 commits March 8, 2018 17:50

chore: ignore mongo script from eslint

2332a6b

docs: develop with docker

dada8ed

style: restyle

af32394

chore: restore eslint conf & ignore by comments

f3842be

fix: fix err path

70e2738

feat: add compose for dev

40843af

chore: use docker db

f369c33

docs: update dev with docker

ea4a999

chore: merge branch 'feature-docker' of https://github.com/cnodejs/eg…

0e4bd6d

…g-cnode into feature-docker

JacksonTian and others added 16 commits March 8, 2018 18:50

Merge branch 'master' into feature-docker

ddbd7be

feat: add docker support

ff30161

feat: add config for prod

7e77edd

chore: bootstrap egg without deamon

a9dab39

feat: add mongo init script

15659a0

chore: ignore mongo script from eslint

5826140

docs: develop with docker

19fb03b

style: restyle

a853295

chore: restore eslint conf & ignore by comments

67ce942

fix: fix err path

fe54700

feat: add compose for dev

e20d486

chore: use docker db

2bf318f

docs: update dev with docker

fdc8831

chore: add default github id and secret

240b3f6

chore: merge branch 'feature-docker' of https://github.com/cnodejs/eg…

1d91d02

…g-cnode into feature-docker

chore: use env as default config

cf796ee

JacksonTian approved these changes Mar 8, 2018

View reviewed changes

atian25 merged commit ce9247a into master Mar 8, 2018

atian25 deleted the feature-docker branch March 8, 2018 15:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: docker support #38

feat: docker support #38

thonatos commented Mar 6, 2018 •

edited

Loading

codecov bot commented Mar 6, 2018 •

edited

Loading

atian25 Mar 7, 2018

atian25 Mar 7, 2018

JacksonTian Mar 7, 2018

thonatos Mar 7, 2018 •

edited

Loading

thonatos Mar 7, 2018

atian25 Mar 7, 2018

thonatos Mar 7, 2018 •

edited

Loading

atian25 Mar 7, 2018

thonatos Mar 7, 2018 •

edited

Loading

JacksonTian Mar 7, 2018

atian25 Mar 7, 2018

thonatos Mar 7, 2018

atian25 commented Mar 7, 2018

thonatos commented Mar 7, 2018 •

edited

Loading

JacksonTian commented Mar 8, 2018


		# RUN npm i --production

		RUN npm i --production --registry=https://registry.npm.taobao.org

feat: docker support #38

feat: docker support #38

Conversation

thonatos commented Mar 6, 2018 • edited Loading

Checklist

Affected core subsystem(s)

Description of change

codecov bot commented Mar 6, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thonatos Mar 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thonatos Mar 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thonatos Mar 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atian25 commented Mar 7, 2018

thonatos commented Mar 7, 2018 • edited Loading

JacksonTian commented Mar 8, 2018

thonatos commented Mar 6, 2018 •

edited

Loading

codecov bot commented Mar 6, 2018 •

edited

Loading

thonatos Mar 7, 2018 •

edited

Loading

thonatos Mar 7, 2018 •

edited

Loading

thonatos Mar 7, 2018 •

edited

Loading

thonatos commented Mar 7, 2018 •

edited

Loading