From 7167c77515286484c4fc4c1cffae49d46c2218af Mon Sep 17 00:00:00 2001 From: Simon Siegert Date: Tue, 16 Jan 2018 11:10:06 +0100 Subject: [PATCH 1/3] Create Dockerfile and docker-compose.yml --- Dockerfile | 22 ++++++++++++++++++++++ docker-compose.yml | 7 +++++++ 2 files changed, 29 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..41ed062 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM node:8.4 + +ENV HOME=/home/app +WORKDIR $HOME + +COPY package.json package.json +COPY package-lock.json package-lock.json + +RUN npm install + +COPY tsconfig.json tsconfig.json +COPY tslint.json tslint.json +COPY protractor.conf.js protractor.conf.js +COPY karma.conf.js karma.conf.js +COPY .angular-cli.json .angular-cli.json + +COPY e2e e2e +COPY src src + +EXPOSE 4200:4200 + +ENTRYPOINT ["npm", "start", "--"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..91b331a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +version: "3.3" +services: + angular-frontend: + build: . + container_name: angular-frontend + ports: + - "4200:4200" From 2667028a17688fa8ef636c31b74d17f1bcb88b1e Mon Sep 17 00:00:00 2001 From: Finn K Date: Tue, 16 Jan 2018 11:39:18 +0100 Subject: [PATCH 2/3] Expose angular to external connections --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da614f6..d774c09 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --host=0.0.0.0 --port=4200", "build": "ng build", "test": "ng test --code-cover", "lint": "ng lint", From c25cc129a7f7a5eb65377efeb5c5d9b2329fadf9 Mon Sep 17 00:00:00 2001 From: Finn K Date: Tue, 16 Jan 2018 11:46:11 +0100 Subject: [PATCH 3/3] Exclude dockerfiles from coverage report --- karma.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/karma.conf.js b/karma.conf.js index 8893c95..7cbbd87 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -22,6 +22,7 @@ module.exports = function (config) { angularCli: { environment: 'dev' }, + exclude: ['docker-compose.yml', 'Dockerfile'], reporters: ['progress', 'kjhtml'], port: 9876, colors: true,