From 7b7dde28fbf5879f1d9fba30c14cc126ecdeceeb Mon Sep 17 00:00:00 2001 From: Andrey Derevyagin <2derand@gmail.com> Date: Sun, 13 Aug 2017 22:32:40 +0300 Subject: [PATCH 1/4] Adding docker files for armhf architecture --- .dockerignore | 1 + docker-armhf/Dockerfile | 15 +++++++++++++++ docker-armhf/docker-compose.yml | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 .dockerignore create mode 100644 docker-armhf/Dockerfile create mode 100644 docker-armhf/docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6b8710a --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git diff --git a/docker-armhf/Dockerfile b/docker-armhf/Dockerfile new file mode 100644 index 0000000..2267e21 --- /dev/null +++ b/docker-armhf/Dockerfile @@ -0,0 +1,15 @@ +# +# BUILD: docker build --rm -t derand/node-websocket-vs-socket.io-armhf -f ./docker-armhf/Dockerfile . +# RUN: docker run --detach=true -p 3001:3001 -p 3002:3002 --name node-websocket-vs-socket.io derand/node-websocket-vs-socket.io-armhf +# + +FROM hypriot/rpi-node + +COPY . /node-websocket-vs-socket.io/ +WORKDIR /node-websocket-vs-socket.io/ + +RUN npm i + +EXPOSE 3001 3002 + +ENTRYPOINT ["./ws-vs-si.js"] diff --git a/docker-armhf/docker-compose.yml b/docker-armhf/docker-compose.yml new file mode 100644 index 0000000..b5c2f24 --- /dev/null +++ b/docker-armhf/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' + +services: + node-websocket-vs-socket.io: + image: "derand/node-websocket-vs-socket.io-armhf" + build: + context: ../ + dockerfile: ./docker-armhf/Dockerfile + container_name: node-websocket-vs-socket.io + hostname: node-websocket-vs-socket.io + ports: + - "3001:3001" + - "3002:3002" + logging: &default_logging + driver: json-file + options: + max-size: "500k" + max-file: "1" + From 75681732af18062ece174e1594a31a4922798bc2 Mon Sep 17 00:00:00 2001 From: Andrey Derevyagin <2derand@gmail.com> Date: Tue, 15 Aug 2017 12:33:29 +0300 Subject: [PATCH 2/4] Add docker --- docker/Dockerfile | 15 +++++++++++++++ docker/docker-compose.yml | 17 +++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 docker/Dockerfile create mode 100644 docker/docker-compose.yml diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..0b7133b --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,15 @@ +# +# BUILD: docker build --rm -t derand/node-websocket-vs-socket.io -f ./docker/Dockerfile . +# RUN: docker run --detach=true -p 3001:3001 -p 3002:3002 --name node-websocket-vs-socket.io derand/node-websocket-vs-socket.io +# + +FROM node + +COPY . /node-websocket-vs-socket.io/ +WORKDIR /node-websocket-vs-socket.io/ + +RUN npm i + +EXPOSE 3001 3002 + +ENTRYPOINT ["./ws-vs-si.js"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..a14d7f8 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,17 @@ +# +# docker-compose -f ./docker/docker-compose.yml build +# docker-compose -f ./docker/docker-compose.yml up -d +# + +version: '2' +services: + node-websocket-vs-socket.io: + image: "derand/node-websocket-vs-socket.io" + build: + context: ../ + dockerfile: ./docker/Dockerfile + container_name: node-websocket-vs-socket.io + hostname: node-websocket-vs-socket.io + ports: + - "3001:3001" + - "3002:3002" From 0929781045295d3f3d52b636f0b0509b014b00c7 Mon Sep 17 00:00:00 2001 From: Andrey Derevyagin <2derand@gmail.com> Date: Tue, 15 Aug 2017 14:28:16 +0300 Subject: [PATCH 3/4] cosmetic "docker-armhf" --- docker-armhf/Dockerfile | 4 ++-- docker-armhf/docker-compose.yml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker-armhf/Dockerfile b/docker-armhf/Dockerfile index 2267e21..e93735c 100644 --- a/docker-armhf/Dockerfile +++ b/docker-armhf/Dockerfile @@ -1,6 +1,6 @@ # -# BUILD: docker build --rm -t derand/node-websocket-vs-socket.io-armhf -f ./docker-armhf/Dockerfile . -# RUN: docker run --detach=true -p 3001:3001 -p 3002:3002 --name node-websocket-vs-socket.io derand/node-websocket-vs-socket.io-armhf +# BUILD: docker build --rm -t derand/node-websocket-vs-socket.io:armhf -f ./docker-armhf/Dockerfile . +# RUN: docker run --detach=true -p 3001:3001 -p 3002:3002 --name node-websocket-vs-socket.io derand/node-websocket-vs-socket.io:armhf # FROM hypriot/rpi-node diff --git a/docker-armhf/docker-compose.yml b/docker-armhf/docker-compose.yml index b5c2f24..871714e 100644 --- a/docker-armhf/docker-compose.yml +++ b/docker-armhf/docker-compose.yml @@ -1,8 +1,11 @@ +# +# docker-compose -f ./docker-armhf/docker-compose.yml build +# docker-compose -f ./docker-armhf/docker-compose.yml up -d +# version: '2' - services: node-websocket-vs-socket.io: - image: "derand/node-websocket-vs-socket.io-armhf" + image: "derand/node-websocket-vs-socket.io:armhf" build: context: ../ dockerfile: ./docker-armhf/Dockerfile @@ -16,4 +19,3 @@ services: options: max-size: "500k" max-file: "1" - From f858d94de45388722cfb6c5b21478285d57d9540 Mon Sep 17 00:00:00 2001 From: Andrey Derevyagin <2derand@gmail.com> Date: Tue, 15 Aug 2017 14:28:40 +0300 Subject: [PATCH 4/4] update README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 328ef8f..cc5f1a8 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,14 @@ npm i ./ws-vs-si.js ``` +### Installing from Docker +You can build and run own docker image running from "root" repo folder +``` +docker-compose -f ./docker/docker-compose.yml build +docker-compose -f ./docker/docker-compose.yml up -d +``` + + Running ------- You start the server with either