From 9d4a09b8bd0012cacb397f755ce0d281d92cc64f Mon Sep 17 00:00:00 2001
From: Josh Burman <josh.burman@getyardstick.com>
Date: Wed, 27 Feb 2019 14:57:29 -0500
Subject: [PATCH] compose shenannigans

---
 .docker-compose/Dockerfile | 21 +++++++++++++++++++++
 .vagrantrc                 |  6 +++---
 docker-compose.yml         |  6 ------
 docker-compose/Dockerfile  | 24 ------------------------
 4 files changed, 24 insertions(+), 33 deletions(-)
 create mode 100755 .docker-compose/Dockerfile
 mode change 100644 => 100755 docker-compose.yml
 delete mode 100755 docker-compose/Dockerfile

diff --git a/.docker-compose/Dockerfile b/.docker-compose/Dockerfile
new file mode 100755
index 0000000..61b9250
--- /dev/null
+++ b/.docker-compose/Dockerfile
@@ -0,0 +1,21 @@
+FROM node:8
+
+RUN mkdir /app
+WORKDIR /app
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN npm install
+# If you are building your code for production
+# RUN npm ci --only=production
+
+# Bundle app source
+COPY . /app
+
+ENV PORT 80
+EXPOSE 80
+
+CMD [ "npm", "start" ]
diff --git a/.vagrantrc b/.vagrantrc
index 0471043..cbd9637 100755
--- a/.vagrantrc
+++ b/.vagrantrc
@@ -39,9 +39,9 @@ braid-logs() {
   compose "logs braid"
 }
 
-braid-server() {
-  compose "run --rm braid-soap rails server --port 80 --binding 0.0.0.0"
-}
+# braid-server() {
+#   compose "run --rm braid rails server --port 80 --binding 0.0.0.0"
+# }
 
 restart-clean() {
   compose "restart braid"
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index e9cd7a9..3c80374
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,9 +8,3 @@ braid:
     - 172.17.0.1
   volumes:
     - /apps/braid:/app
-  volumes_from:
-    - clean_bundle
-clean_bundle:
-  image: busybox
-  volumes:
-    - /bundle
diff --git a/docker-compose/Dockerfile b/docker-compose/Dockerfile
deleted file mode 100755
index c49b2b8..0000000
--- a/docker-compose/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM ruby:2.3.4
-MAINTAINER Jason Wall <jasonw@getyardstick.com>
-
-RUN mkdir /app
-WORKDIR /app
-
-ENV RUBYOPT -rubygems
-ENV BUNDLE_JOBS 2
-ENV PATH /bundle/bin:$PATH
-ENV LANG C.UTF-8
-
-ENV BUNDLE_PATH /bundle
-ENV BUNDLE_BIN /bundle/bin
-ENV BUNDLE_APP_CONFIG /bundle
-
-ENV LOCAL_DEV yes
-ENV RAILS_ENV development
-
-RUN sed -i 's/mesg/# mesg/g' /root/.profile
-
-EXPOSE 80
-ENV PORT 80
-
-CMD bundle exec rails server --port 80 --binding 0.0.0.0 --pid /tmp/server.$(date +"%Y%m%d%H%M%S").pid