From 975bc741e214fb9012bba7c52feca1ce679328ab Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Thu, 26 Apr 2018 19:37:07 +0200 Subject: [PATCH] Dockerize. #5 --- docker/amd64/Dockerfile | 13 +++++++++++++ docker/arm32v7/Dockerfile | 16 ---------------- docker/arm32v7/build.sh | 4 ---- docker/armv7hf/Dockerfile | 24 ++++++++++++++++++++++++ docker/start.sh | 4 ++++ 5 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 docker/amd64/Dockerfile delete mode 100644 docker/arm32v7/Dockerfile delete mode 100755 docker/arm32v7/build.sh create mode 100644 docker/armv7hf/Dockerfile create mode 100644 docker/start.sh diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile new file mode 100644 index 00000000..46a73b74 --- /dev/null +++ b/docker/amd64/Dockerfile @@ -0,0 +1,13 @@ +FROM node:9 + +# Copy files +ADD . /app +RUN cp /app/data/configuration.yaml /app +RUN cp /app/docker/start.sh /app +RUN chmod +x /app/start.sh + +WORKDIR /app +RUN npm install + +# Entrypoint +ENTRYPOINT ["./start.sh"] diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile deleted file mode 100644 index e9169511..00000000 --- a/docker/arm32v7/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM arm32v7/node - -# Copy files -ADD . /app -RUN cp /app/data/configuration.yaml /app - -# Create startup script. -RUN echo '#!/bin/bash\n\ -cp -n /app/configuration.yaml /app/data/configuration.yaml\n\ -npm start\n'\ ->> /app/start.sh -RUN chmod +x /app/start.sh - -WORKDIR /app -RUN npm install -ENTRYPOINT ["./start.sh"] \ No newline at end of file diff --git a/docker/arm32v7/build.sh b/docker/arm32v7/build.sh deleted file mode 100755 index 489bbb72..00000000 --- a/docker/arm32v7/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker build -t koenkk/zigbee2mqtt:arm32v7 -f Dockerfile ../../ -docker push koenkk/zigbee2mqtt:arm32v7 diff --git a/docker/armv7hf/Dockerfile b/docker/armv7hf/Dockerfile new file mode 100644 index 00000000..49a000ca --- /dev/null +++ b/docker/armv7hf/Dockerfile @@ -0,0 +1,24 @@ +FROM resin/armv7hf-debian + +RUN [ "cross-build-start" ] + +# Install nodejs and git +RUN curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - +RUN apt-get update && apt-get install -y git nodejs make g++ && rm -rf /var/lib/apt/lists/* + +# Copy files +ADD . /app +RUN cp /app/data/configuration.yaml /app +RUN cp /app/docker/start.sh /app +RUN chmod +x /app/start.sh + +WORKDIR /app +RUN npm install + +# Cleanup +RUN apt-get purge g++ make && apt-get autoremove && rm -rf /var/lib/apt/lists/* + +RUN [ "cross-build-end" ] + +# Entrypoint +ENTRYPOINT ["./start.sh"] diff --git a/docker/start.sh b/docker/start.sh new file mode 100644 index 00000000..c2fcb23c --- /dev/null +++ b/docker/start.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +cp -n /app/configuration.yaml /app/data/configuration.yaml +npm start \ No newline at end of file