Update dockerfile to simplify the development

diff --git a/extra/Dockerfile b/extra/Dockerfile
index ac4d5f96db4dcf5d69db83d4651368b97ba317c3..543667491ab03d51a1fb0c244081ce6c782a015c 100644 (file)
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -40,14 +40,14 @@ RUN cd /tmp && \
     autoreconf -fiv && \
     ./configure --prefix=/usr --without-pgsql --without-sdl --without-sqlite3 --without-mysql && \
     make && \
+    touch README \
     make install && \
     cp motion /usr/local/bin/motion && \
     rm -rf /tmp/motion-mrdave
 
-ARG GIT_REPOSITORY=https://github.com/ccrisan/motioneye.git
-RUN cd /tmp && \
-    git clone $GIT_REPOSITORY && \
-    cd /tmp/motioneye && \
+COPY . /tmp/motioneye
+
+RUN cd /tmp/motioneye && \
     python setup.py install && \
     mkdir /etc/motioneye && \
     mkdir -p /var/lib/motioneye && \

diff --git a/extra/README.md b/extra/README.md
deleted file mode 100644 (file)
index a8d91e9..0000000
--- a/extra/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-motionEye comes with a `Dockerfile` and a sample `docker-compose.yml`, both in the `/extra` directory of the project (https://github.com/ccrisan/motioneye/tree/master/extra).
-
-### Instructions
-1. Download the `Dockerfile` and `docker-compose.yml` either by checking out the motioneye repository, or by downloading them directly from Github.
-
-2. Build your motionEye Docker image from the `Dockerfile`. First `cd` into the directory where you put the `Dockerfile`. Then:
-
-        # If you would like build docker image from official project
-        docker build -t motioneye .
-
-        # If you would like build docker image from forked project (ex: from badele github repository)
-        docker build --build-arg GIT_REPOSITORY=https://github.com/badele/motioneye.git -t motioneye .
-        
-*Note:* If /etc/motioneye/motioneye.conf not exist, it's copied from /usr/share/motioneye/extra/motioneye.conf.sample (Not overwrite the volume)
-
-3. Have a cup of coffee while the image builds :)
-
-4. Either start a container using `docker run` or use the provided sample `docker-compose.yml` together with `docker-compose`.
-
-#### With docker run:
-
-        docker run -d --name=motioneye \
-            --device=/dev/video0
-            -p 8081:8081 \
-            -p 8765:8765 \
-            -e TIMEZONE="America/New_York" \
-            -v /mnt/motioneye/media:/media \
-            -v /mnt/motioneye/config:/etc/motioneye \
-            --restart=always \
-            motioneye
-
-#### With docker-compose.yml:
-
-Edit `docker-compose.yml` and modify the timezone to your own (A list is available at http://php.net/manual/en/timezones.php).
-
-Also edit the two mount points to a directory in your system. Save the file, and then run:
-
-        docker-compose -f docker-compose.yml -p motioneye up -d