From aadd145eefe50a2e036f096cf374c38ee1921d64 Mon Sep 17 00:00:00 2001
From: dan <ofbadmin@ofbbutte.com>
Date: Mon, 26 Oct 2020 23:18:24 -0600
Subject: [PATCH] dockerfile

---
 Server/dockerfile                             | 12 ----------
 .../docker-compose.yml => docker-compose.yml  |  0
 dockerfile                                    | 22 +++++++++++++++++++
 drone.yml                                     | 15 +++----------
 4 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 Server/dockerfile
 rename Server/docker-compose.yml => docker-compose.yml (100%)
 create mode 100644 dockerfile

diff --git a/Server/dockerfile b/Server/dockerfile
deleted file mode 100644
index ef0fbfe..0000000
--- a/Server/dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node:12.18.1
- 
-WORKDIR /app
- 
-COPY . .
-
-WORKDIR /src
-
-RUN npm install
- 
-EXPOSE 8111
-CMD [ "node", "app.js 8111" ]
\ No newline at end of file
diff --git a/Server/docker-compose.yml b/docker-compose.yml
similarity index 100%
rename from Server/docker-compose.yml
rename to docker-compose.yml
diff --git a/dockerfile b/dockerfile
new file mode 100644
index 0000000..21a1905
--- /dev/null
+++ b/dockerfile
@@ -0,0 +1,22 @@
+FROM node:12.18.1 as angular
+
+WORKDIR /app/Client
+
+COPY ./Client/package*.json .
+
+RUN npm install
+
+COPY ./Client .
+
+RUN node node_modules/@angular/cli/bin/ng build --prod --configuration=production
+
+WORKDIR /app/Server
+
+COPY ./Server/package*.json .
+
+RUN npm install
+
+COPY ./Server .
+
+EXPOSE 8111
+CMD [ "node", "src/app.js 8111" ]
\ No newline at end of file
diff --git a/drone.yml b/drone.yml
index d1a9cbd..5f5c66e 100644
--- a/drone.yml
+++ b/drone.yml
@@ -2,22 +2,13 @@ kind: pipeline
 type: docker
 name: default
 steps:
-- name: dockerize
+- name: node
   image: docker
   volumes:
-    - name: docker_sock
+    - name: ofb_angular
       path: /var/run/docker.sock
   commands:
-    - cd Server
-    - docker-compose up -d   
-
-- name: build_client
-  image: node
-  commands:
-    - cd Client
-    - npm install
-    - node node_modules/@angular/cli/bin/ng build --prod --configuration=production
-
+    - docker build --tag ofb_angular .
 
 
 volumes: