From 8a9af2ce9f3ff631cfe59044346d041d13239e97 Mon Sep 17 00:00:00 2001 From: umevoshi Date: Sat, 17 Nov 2018 23:35:38 +0900 Subject: [PATCH 1/3] add docker support for client Fixed that CircleCI build fails Add specific nodejs version to Dockerfile. --- Dockerfile | 3 +++ docker-compose.yml | 13 +++++++++++-- web-client/Dockerfile | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 web-client/Dockerfile diff --git a/Dockerfile b/Dockerfile index ffacb65..9c93437 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,3 +4,6 @@ RUN apt-get update && \ curl -sL https://deb.nodesource.com/setup_11.x | bash -\ && apt-get install -y nodejs libssl-dev +WORKDIR /go/src/github.com/maxmcd/webtty + + diff --git a/docker-compose.yml b/docker-compose.yml index 0a971ff..c7d1c77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,14 @@ version: '3.3' services: - app: - build: . + base: + build: + context: . + dockerfile: Dockerfile image: maxmcd/webtty-node-go + web-client: + build: + context: . + dockerfile: ./web-client/Dockerfile + image: maxmcd/webtty-client + ports: + - 8080:80 diff --git a/web-client/Dockerfile b/web-client/Dockerfile new file mode 100644 index 0000000..3ed5170 --- /dev/null +++ b/web-client/Dockerfile @@ -0,0 +1,12 @@ +FROM maxmcd/webtty-node-go as builder + +COPY . . +RUN go get -v . \ + && cd ./web-client \ + && npm install \ + && npm run build + +FROM nginx:alpine +COPY --from=builder \ + /go/src/github.com/maxmcd/webtty/web-client/dist \ + /usr/share/nginx/html From 4ea44cd216088fda77c86ebef20227a58602285e Mon Sep 17 00:00:00 2001 From: maxmcd Date: Sun, 18 Nov 2018 15:39:22 -0500 Subject: [PATCH 2/3] Add mime-type and package.json bugfixes --- web-client/Dockerfile | 5 +++++ web-client/package.json | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/web-client/Dockerfile b/web-client/Dockerfile index 3ed5170..f6d5ba4 100644 --- a/web-client/Dockerfile +++ b/web-client/Dockerfile @@ -7,6 +7,11 @@ RUN go get -v . \ && npm run build FROM nginx:alpine + +RUN echo "application/wasm wasm" >> /etc/mime.types \ + && sed -i -e 's/wmlc;/wmlc;\n application\/wasm wasm;\n/g' /etc/nginx/mime.types + COPY --from=builder \ /go/src/github.com/maxmcd/webtty/web-client/dist \ /usr/share/nginx/html + diff --git a/web-client/package.json b/web-client/package.json index 13d2f5a..c3ae891 100644 --- a/web-client/package.json +++ b/web-client/package.json @@ -1,8 +1,13 @@ { "name": "webtty", - "version": "0.0.1", - "description": "", - "main": "app.js", + "version": "0.0.2", + "description": "webtty web client", + "repository": "", + "repository": { + "type": "git", + "url": "git+https://github.com/maxmcd/webtty.git" + }, + "main": "src/app.ts", "scripts": { "build": "npm run go-build && parcel build src/index.html --public-url .", "go-build": @@ -11,8 +16,8 @@ "test": "echo notests", "deploy": "npm run build && gh-pages -d dist" }, - "author": "", - "license": "ISC", + "author": "Max McDonnell", + "license": "MIT", "dependencies": { "@babel/core": "^7.1.5", "@babel/runtime-corejs2": "^7.1.5", From a682617d6de2da28d5b09784a8e2875aca823c61 Mon Sep 17 00:00:00 2001 From: maxmcd Date: Sun, 18 Nov 2018 15:45:34 -0500 Subject: [PATCH 3/3] Clean up Dockerfile --- Dockerfile | 6 +++++- web-client/Dockerfile | 2 +- web-client/package.json | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c93437..ef4f88f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,11 @@ FROM golang:1.11.2-stretch RUN apt-get update && \ curl -sL https://deb.nodesource.com/setup_11.x | bash -\ - && apt-get install -y nodejs libssl-dev + && apt-get install -y --no-install-recommends \ + nodejs=11.2.0* \ + libssl-dev=1.1.0* \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* WORKDIR /go/src/github.com/maxmcd/webtty diff --git a/web-client/Dockerfile b/web-client/Dockerfile index f6d5ba4..f58441c 100644 --- a/web-client/Dockerfile +++ b/web-client/Dockerfile @@ -1,4 +1,4 @@ -FROM maxmcd/webtty-node-go as builder +FROM maxmcd/webtty-node-go:latest as builder COPY . . RUN go get -v . \ diff --git a/web-client/package.json b/web-client/package.json index c3ae891..eb91641 100644 --- a/web-client/package.json +++ b/web-client/package.json @@ -2,7 +2,6 @@ "name": "webtty", "version": "0.0.2", "description": "webtty web client", - "repository": "", "repository": { "type": "git", "url": "git+https://github.com/maxmcd/webtty.git"