4 files changed, 19 insertions, 14 deletions
diff --git a/vendor/Dockerfile/Node-alpine.Dockerfile b/vendor/Dockerfile/Node-alpine.Dockerfile
index 9776b1336b5..5b9b495644a 100644
--- a/vendor/Dockerfile/Node-alpine.Dockerfile
+++ b/vendor/Dockerfile/Node-alpine.Dockerfile
@@ -1,14 +1,15 @@
-FROM node:7.9-alpine
+FROM node:8.11-alpine
 
 WORKDIR /usr/src/app
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY package.json /usr/src/app/
-RUN npm install && npm cache clean
-COPY . /usr/src/app
+RUN npm install
 
-CMD [ "npm", "start" ]
+COPY . /usr/src/app
 
 # replace this with your application's default port
 EXPOSE 8888
+CMD [ "npm", "start" ]
diff --git a/vendor/Dockerfile/Node.Dockerfile b/vendor/Dockerfile/Node.Dockerfile
index 7e936d5e887..e8b64b3a6e4 100644
--- a/vendor/Dockerfile/Node.Dockerfile
+++ b/vendor/Dockerfile/Node.Dockerfile
@@ -1,14 +1,15 @@
-FROM node:7.9
+FROM node:8.11
 
 WORKDIR /usr/src/app
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY package.json /usr/src/app/
-RUN npm install && npm cache clean
-COPY . /usr/src/app
+RUN npm install
 
-CMD [ "npm", "start" ]
+COPY . /usr/src/app
 
 # replace this with your application's default port
 EXPOSE 8888
+CMD [ "npm", "start" ]
+\ No newline at end of file
diff --git a/vendor/Dockerfile/Ruby-alpine.Dockerfile b/vendor/Dockerfile/Ruby-alpine.Dockerfile
index 9db4e2130f2..dffe9a65116 100644
--- a/vendor/Dockerfile/Ruby-alpine.Dockerfile
+++ b/vendor/Dockerfile/Ruby-alpine.Dockerfile
@@ -1,8 +1,8 @@
-FROM ruby:2.4-alpine
+FROM ruby:2.5-alpine
 
 # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
 # Or delete entirely if not needed.
-RUN apk --no-cache add nodejs postgresql-client
+RUN apk --no-cache add nodejs postgresql-client tzdata
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -11,7 +11,10 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 COPY Gemfile Gemfile.lock /usr/src/app/
-RUN bundle install
+# Install build dependencies - required for gems with native dependencies
+RUN apk add --no-cache --virtual build-deps build-base postgresql-dev && \
+  bundle install && \
+  apk del build-deps
 
 COPY . /usr/src/app
 
@@ -21,4 +24,4 @@ COPY . /usr/src/app
 
 # For Rails
 EXPOSE 3000
-CMD ["rails", "server"]
+CMD ["bundle", "exec", "rails", "server"]
diff --git a/vendor/Dockerfile/Ruby.Dockerfile b/vendor/Dockerfile/Ruby.Dockerfile
index feb880ee4b2..289ed57bfa2 100644
--- a/vendor/Dockerfile/Ruby.Dockerfile
+++ b/vendor/Dockerfile/Ruby.Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:2.5
 
 # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
 # Or delete entirely if not needed.
@@ -24,4 +24,4 @@ COPY . /usr/src/app
 
 # For Rails
 EXPOSE 3000
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]