From c34b736edd8f11de8f389a12180b6d179c290dfe Mon Sep 17 00:00:00 2001
From: Karl-Philipp Wulfert <krlwlfrt@gmail.com>
Date: Fri, 5 Jul 2019 16:05:23 +0200
Subject: [PATCH] refactor: adjust docker image creation

---
 .gitlab-ci.yml            |  6 ++----
 images/builder/Dockerfile | 11 +++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46081810..1e0cf0b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,9 +31,8 @@ docker-builder:
   services:
     - docker:dind
   script:
-    - cd images/builder
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
-    - docker build -t registry.gitlab.com/openstapps/projectmanagement/builder .
+    - docker build -t registry.gitlab.com/openstapps/projectmanagement/builder -f images/builder/Dockerfile .
     - docker push registry.gitlab.com/openstapps/projectmanagement/builder
   tags:
     - docker
@@ -49,9 +48,8 @@ docker-node:
   services:
     - docker:dind
   script:
-    - cd images/node
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com/openstapps/projectmanagement/
-    - docker build -t registry.gitlab.com/openstapps/projectmanagement/node .
+    - docker build -t registry.gitlab.com/openstapps/projectmanagement/node -f images/node/Dockerfile .
     - docker push registry.gitlab.com/openstapps/projectmanagement/node
   tags:
     - docker
diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
index 99d90bfc..5717ddf4 100644
--- a/images/builder/Dockerfile
+++ b/images/builder/Dockerfile
@@ -1,3 +1,14 @@
 FROM docker:stable
 
+RUN apk update && apk add nodejs npm git
+
+ADD . /opt/openstapps/projectmanagement
+
+WORKDIR /opt/openstapps/projectmanagement
+
+RUN npm ci && \
+  npm run build && \
+  chmod +x /opt/openstapps/projectmanagement/lib/cli.js && \
+  ln -s /opt/openstapps/projectmanagement/lib/cli.js /usr/bin/openstapps-projectmanagement
+
 CMD []