Further cleanups of docker image

plus adding a health check

.dockerignore

@@ -1,4 +1,27 @@
+*.log
 /.bundle
+/.docker
 /.env
-/.git
-.travis.yml
+/.rake_tasks
+/.rspec
+/.rubocop.yml
+/.rubocop_todo.yml
+/.simplecov
+/.travis.yml
+/.vagrant
+/CONTRIBUTING.md
+/Dockerfile
+/Procfile
+/README.md
+/coverage
+/docker-compose.yml
+/example_payloads
+/examples
+/init.rb
+/script/build-s3-index-html
+/script/docker-build-and-push
+/script/handle-docker-config
+/script/validate-example-payloads-with-docker
+/spec
+/tmp
+/vendor

Dockerfile

@@ -3,12 +3,12 @@ WORKDIR /usr/src/app
 
 ARG GITHUB_OAUTH_TOKEN=notset
 
-RUN bundle config --global frozen 1
-
 COPY . .
 
-RUN bundle install
+RUN git describe --always --dirty --tags | tee VERSION
+RUN bundle install --frozen --deployment --without='development test' --clean
 RUN bundle exec rake assets:precompile GITHUB_OAUTH_TOKEN=$GITHUB_OAUTH_TOKEN
+RUN tar -cjf public.tar.bz2 public && rm -rf public
 
 FROM ruby:2.5.3-slim
 LABEL maintainer Travis CI GmbH <[email protected]>
@@ -18,7 +18,9 @@ ENV TRAVIS_BUILD_DUMP_BACKTRACE true
 ENV PORT 4000
 
 COPY --from=builder /usr/src/app /usr/src/app
-COPY --from=builder /usr/local/bundle /usr/local/bundle
-COPY --from=builder /root/.bundle /root/.bundle
+COPY --from=builder /usr/local/bundle/config /usr/local/bundle/config
+RUN rm -rf .git
 
+HEALTHCHECK --interval=5s CMD script/healthcheck
+EXPOSE 4000/tcp
 CMD ["script/server"]

lib/travis/build.rb

@@ -24,8 +24,13 @@ def top
 
     class << self
       def version
-        @version ||= `git rev-parse HEAD 2>/dev/null || \\
-                        echo "${HEROKU_SLUG_COMMIT:-unknown}"`.strip
+        return @version if @version
+        @version ||= `git describe --always --dirty --tags 2>/dev/null`.strip
+        @version = nil unless $?.success?
+        @version ||= ENV.fetch('HEROKU_SLUG_COMMIT', nil)
+        @version ||= top.join('VERSION').read if top.join('VERSION').exist?
+        @version ||= 'unknown'
+        @version
       end
 
       def self.register(key)

script/healthcheck

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'net/http'
+require 'uri'
+Net::HTTP.get(
+  URI("http://localhost:#{ENV.fetch('PORT', '4000')}/uptime")
+)

script/server

@@ -13,7 +13,13 @@ main() {
     -w "${PUMA_WORKERS:-2}"
   )
 
-  if [[ "${RACK_ENV}" == development && ! "${DISABLE_RERUN}" ]]; then
+  if [[ -f public.tar.bz2 && ! -d public ]]; then
+    tar -xf public.tar.bz2
+  fi
+
+  if [[ "${RACK_ENV}" == development ]] &&
+    [[ ! -f /.dockerenv ]] &&
+    [[ ! "${DISABLE_RERUN}" ]]; then
     cmd=(bundle exec rerun -p '**/*.{rb,ru}' -- "${cmd[@]}")
   fi