Slim down the image

* Test-related code is moved out of tha main image

Author: pointlessone

Diff for: Dockerfile

@@ -1,19 +1,34 @@
-FROM codeclimate/alpine-ruby:b38
+FROM alpine:3.6
+
+RUN adduser -u 9000 -D app
 
 WORKDIR /usr/src/app
-RUN apk --update add ruby ruby-bundler git
 
-COPY Gemfile* /usr/src/app/
-RUN bundle install --jobs 4 && \
-    rm -rf /usr/share/ri
+RUN apk add --no-cache ruby ruby-json git && \
+  gem install --no-ri --no-rdoc bundler && \
+  rm -r ~/.gem
 
-RUN adduser -u 9000 -D app
-USER app
+COPY Gemfile* /usr/src/app/
+RUN bundle install --without=test --no-cache && \
+    rm -rf ~/.bundle /usr/lib/ruby/gems/2.4.0/cache/* /usr/share/ri
 
 COPY DATABASE_VERSION /usr/src/app/DATABASE_VERSION
 
-RUN bundle-audit update
+COPY bin bin/
+COPY lib lib/
+RUN chown -R app:app .
+
+USER app
 
-COPY . /usr/src/app
+# The following step has to be ran by app user aas it depends on $HOME
+RUN bundle-audit update && \
+  for f in ~/.local/share/ruby-advisory-db/*  ~/.local/share/ruby-advisory-db/.*; do \
+    name="$(basename "$f")"; \
+    test "$name" = "gems" || \
+      test "$name" = "." || \
+      test "$name" = ".." || \
+      test "$name" = ".git" || \
+      rm -r "$f"; \
+  done
 
 CMD ["/usr/src/app/bin/bundler-audit"]

Diff for: Dockerfile.test

@@ -0,0 +1,13 @@
+FROM codeclimate/codeclimate-bundler-audit
+
+USER root
+
+RUN bundler install --no-cache --with="development test"
+
+COPY Rakefile ./
+COPY spec spec/
+RUN chown -R app:app Rakefile spec
+
+user app
+
+CMD ["bundle", "exec", "rake"]

Diff for: Makefile

@@ -1,15 +1,20 @@
 .PHONY: image test citest update_version
 
 IMAGE_NAME ?= codeclimate/codeclimate-bundler-audit
+TEST_IMAGE_NAME ?= $(IMAGE_NAME)-test
 
 image:
 	docker build --rm -t $(IMAGE_NAME) .
 
-test: image
-	docker run -e PAGER=more --tty --interactive --rm $(IMAGE_NAME) bundle exec rake
+test-image: image
+	docker build --rm -t $(TEST_IMAGE_NAME) -f Dockerfile.test .
 
-citest:
-	docker run --rm $(IMAGE_NAME) bundle exec rake
+test:
+	@$(MAKE) test-image > /dev/null
+	docker run \
+        -e PAGER=more \
+        --tty --interactive --rm \
+        $(TEST_IMAGE_NAME)
 
 update_database:
 	date > DATABASE_VERSION

Diff for: circle.yml

@@ -12,11 +12,11 @@ dependencies:
       --env GCR_JSON_KEY
       --volume /var/run/docker.sock:/var/run/docker.sock
       codeclimate/patrick pull || true
-    - make image
+    - make test-image
 
 test:
   override:
-    - make citest
+    - make test
 
 deployment:
   registry:

Diff for: lib/cc/engine/bundler_audit/analyzer.rb

@@ -1,3 +1,5 @@
+require "tmpdir"
+
 module CC
   module Engine
     module BundlerAudit