Merge pull request #9 from dragonchaser/fix_docker_autobuild

Fix docker autobuild
dragonchaser · Oct 15, 2020 · a507500 · a507500
2 parents 48577af + dfda30d
commit a507500
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -36,14 +36,24 @@ MIT see [LICENSE](https://github.com/dragonchaser/matrix-feeder/blob/master/LICE
 
 #### run
 
+- x86_64
   ```bash
-  $> docker run -v/path/to/you/config.json:/matrix-feeder/config/config.json dragonchaser/matrix-feeder:latest
+  $> docker run \
+     -v/path/to/you/config.json:/matrix-feeder/config/config.json \
+     dragonchaser/matrix-feeder:latest
+  ```
+
+- arm32v7 (raspberry pi 2 & 3)
+  ```bash
+  $> docker run \
+     -v/path/to/you/config.json:/matrix-feeder/config/config.json \
+     dragonchaser/matrix-feeder:latest-arm32v7
   ```
 
 #### build
 
   ```bash
   $> git clone https://github.com/dragonchaser/matrix-feeder
-  $> cd matrix-feeder/docker
-  $> docker build . -t <imagename>:<tag>
+  $> cd matrix-feeder
+  $> docker build -f docker/Dockerfile -t <imagename>:<tag> .
   ```
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:latest
 LABEL maintainer="dragonchaser <matrix-feeder@datenschmutz.space>"
-RUN git clone https://github.com/dragonchaser/matrix-feeder /matrix-feeder
+COPY . /matrix-feeder
 WORKDIR /matrix-feeder
 RUN npm install
 CMD node feeder.js

diff --git a/docker/Dockerfile.arm32v7 b/docker/Dockerfile.arm32v7
@@ -1,7 +1,7 @@
 FROM arm32v7/node:latest
 LABEL maintainer="dragonchaser <matrix-feeder@datenschmutz.space>"
 COPY qemu-arm-static /usr/bin
-RUN git clone https://github.com/dragonchaser/matrix-feeder /matrix-feeder
+COPY . /matrix-feeder
 WORKDIR /matrix-feeder
 RUN npm install
 CMD node feeder.js