From 79452dfb85bceaf3e08b21f6a62a9e8389d9e5f4 Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sat, 27 Jan 2018 16:40:49 +0200 Subject: [PATCH 1/5] delete Dockerfile --- Dockerfile | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e223817..0000000 --- a/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:0.10.38 -MAINTAINER Nathan LeClaire - -ADD . /app -WORKDIR /app -RUN npm install -RUN apt-get update -RUN apt-get install -y vim -RUN useradd -d /home/term -m -s /bin/bash term -RUN echo 'term:term' | chpasswd - -EXPOSE 3000 - -ENTRYPOINT ["node"] -CMD ["app.js", "-p", "3000"] From b3215210d54a283cdc60d1a7ec125a08b477ad56 Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sat, 27 Jan 2018 16:50:53 +0200 Subject: [PATCH 2/5] create dockerfile and docker-compose --- Dockerfile | 12 ++++++++++++ docker-compose.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..53d2b4c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM node:8-onbuild AS build + +COPY . /app +WORKDIR /app + +RUN npm install + +FROM node:8-alpine +COPY --from=build /app /app +WORKDIR /app + +CMD node app.js -p 3000 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..617edad --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,6 @@ +version: "3.1" +services: + wetty: + build: . + ports: + - "3000:3000" From 3b317b6341e7a71e2a798f9564209298c28bc3db Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sat, 27 Jan 2018 17:26:03 +0200 Subject: [PATCH 3/5] remove a few newlines --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53d2b4c..e418e2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,9 @@ FROM node:8-onbuild AS build - COPY . /app WORKDIR /app - RUN npm install FROM node:8-alpine COPY --from=build /app /app WORKDIR /app - CMD node app.js -p 3000 From 9d269a7d7b94d6e709880693e884164ee29d365d Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sat, 27 Jan 2018 18:29:42 +0200 Subject: [PATCH 4/5] install openssh-client --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e418e2b..bfdb600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ WORKDIR /app RUN npm install FROM node:8-alpine +RUN apk add --update openssh-client COPY --from=build /app /app WORKDIR /app CMD node app.js -p 3000 From 583f817e1bfcefb47d6eecfe82f1fc85c2372dd1 Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sat, 27 Jan 2018 18:34:10 +0200 Subject: [PATCH 5/5] build using package.json only --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfdb600..cf29be0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ FROM node:8-onbuild AS build -COPY . /app +COPY package.json /app/package.json WORKDIR /app RUN npm install FROM node:8-alpine RUN apk add --update openssh-client -COPY --from=build /app /app +COPY . /app +COPY --from=build /app/node_modules /app/node_modules WORKDIR /app CMD node app.js -p 3000