From c256af7cdb682bdd4880577207f40446c8ede640 Mon Sep 17 00:00:00 2001
From: Noah Koontz <nkoontz@newrelic.com>
Date: Tue, 8 Dec 2020 12:06:03 -0800
Subject: [PATCH] feat: update dockerfile to reflect new dependencies

---
 .dockerignore |  9 +++++++++
 Dockerfile    | 35 ++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..d7c53d50
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.nyc_output/
+coverage/
+node_modules/
+tmp/
+.idea/
+vendor/
+.bundle
+out
+.vscode/
diff --git a/Dockerfile b/Dockerfile
index 76aed3d4..23995221 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,32 +10,41 @@
 #
 #   docker run -t repolinter --git https://github.com/username/repo.git
 #
-FROM ruby:2.5.1-slim as ruby-deps
 
-ENV RUNTIME_DEPS git libicu57
-ENV BUILD_DEPS make build-essential cmake pkg-config libicu-dev zlib1g-dev libcurl4-openssl-dev libssl-dev
+ARG RUNTIME_DEPS="git libicu-dev"
+ARG BUILD_DEPS="make build-essential cmake pkg-config zlib1g-dev libcurl4-openssl-dev libssl-dev libldap2-dev libidn11-dev"
 
+FROM ruby:2.6-slim as ruby-deps
+ARG RUNTIME_DEPS
+ARG BUILD_DEPS
+
+# Install build deps
 RUN apt-get update && \
     apt-get install --no-install-recommends -y $RUNTIME_DEPS $BUILD_DEPS && \
-    gem install --no-document licensee github-linguist && \
-    apt-get remove -y $BUILD_DEPS && \
+    gem update --system --silent
+
+# Install ruby gems
+WORKDIR /app
+COPY Gemfile* ./
+RUN bundle config path vendor/bundle && \
+    bundle install --jobs 4 --retry 3
+
+# cleanup
+RUN apt-get remove -y $BUILD_DEPS && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
-
-FROM node:10-slim
+FROM node:lts-slim
 
 # Copy Ruby dependencies
 COPY --from=ruby-deps . .
 
-# Copy ENV from Ruby image
-ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME"
-ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
-
+# Install node_modules
 WORKDIR /app
 COPY package*.json ./
 RUN npm install --production
+
+# move the rest of the project over
 COPY . .
 
-ENTRYPOINT ["node", "/app/bin/repolinter.js"]
+ENTRYPOINT ["bundle", "exec", "/app/bin/repolinter.js"]