change dockerfile

.idea/libraries/mcotton_v1_node_modules.xml

-<component name="libraryTable">
-  <library name="mcotton-v1 node_modules" type="javaScript">
-    <properties>
-      <option name="frameworkName" value="node_modules" />
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/node_modules" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/node_modules" />
-    </CLASSES>
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

.idea/mcotton-v1.iml

@@ -6,5 +6,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="meteor-packages-auto-import-browser" level="project" />
+    <orderEntry type="library" name="meteor-packages-auto-import-npm" level="project" />
   </component>
 </module>
\ No newline at end of file

Dockerfile

-FROM cuckoohello/meteord:onbuild
+FROM nginx
+
+RUN sed -i 's/httpredir.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && apt-get update && \
+    apt-get install -y --no-install-recommends wget xz-utils g++ && apt-get clean
+
+RUN apt-get install -y --no-install-recommends ca-certificates unzip make bzip2 curl git python2.7 graphicsmagick && \
+    apt-get clean && ln -s /usr/bin/python2.7 /usr/bin/python
+
+RUN echo "Asia/Shanghai" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata && \
+  apt-get install -y --no-install-recommends locales && echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen && update-locale LANG=en_US.UTF-8 && \
+  apt-get clean
+
+ENV LC_ALL en_US.UTF-8
+
+RUN curl -sL https://install.meteor.com | /bin/sh
+RUN cd /data && git clone https://git.microduino.cn/mCotton/mcotton-v1 && cd mcotton-v1
+
+RUN meteor update --allow-superuser --all-packages && meteor npm install && meteor npm install --save bcrypt && meteor reset --allow-superuser
+RUN MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor --allow-superuser --release 1.4.2.3
\ No newline at end of file

README.md

@@ -90,7 +90,6 @@ mCotton 是 server ， httpclient*.js 是访问他的Node.js客户端
 
 ![docs/mcotton_01.png](docs/mcotton_01.png)
 
-** On meteor 1.4, Account admin has bug and can't used.
 If you want to set your admin, you can change the file : /app/server/fixtures.js
 
 # Projects
@@ -105,4 +104,14 @@ If you want to set your admin, you can change the file : /app/server/fixtures.js
 
 ## Smart Vulture Egg
 
-详情参见 [egg.md](docs/egg.md)
\ No newline at end of file
+详情参见 [egg.md](docs/egg.md)
+
+# Docker build
+
+    docker build -t mcotton_v1 .
+    
+# Docker run
+
+    docker run -d -p 27017:27017 --name mymongo -v $(cd ~ && pwd)/data/mongo:/data mongo
+    
+    docker run -d -p 3000:3000 -p 1883:1883 --link mymongo:mongodb --name mcotton_v1 -v $(cd ~ && pwd)/data/mcotton_v1:/data -w /data mcotton_v1
\ No newline at end of file