From 6548091f2fed3854f13a86ef31ebd01845ad2ce0 Mon Sep 17 00:00:00 2001
From: Adam Constabaris <noreply@do.not.reply.github.com>
Date: Tue, 23 May 2023 09:57:21 -0400
Subject: [PATCH] bump version; docker improvements

Allow building against different rubies via RUBY_VERSION build arg
---
 Dockerfile    | 9 ++++-----
 VERSION       | 2 +-
 entrypoint.sh | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 189a1bf6..3b924167 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM ruby:2.7.5 AS app_bootstrap
+ARG RUBY_VERSION=2.7.6
+FROM ruby:${RUBY_VERSION} AS app_bootstrap
 
-RUN apt-get update && apt-get install -y nodejs vim tree
+RUN apt-get update && apt-get install -y nodejs vim less
 
 FROM app_bootstrap AS builder
 
@@ -10,11 +11,9 @@ COPY lib/trln_argon/version.rb /build/lib/trln_argon/version.rb
 
 WORKDIR /build
 
-RUN tree
-
 RUN $(./bundler_config.rb path /gems) && bundle install -j $(nproc)
 
-FROM app_bootstrap
+FROM app_bootstrap AS runnable
 
 COPY --from=builder /gems /gems
 COPY ./bundler_config.rb .
diff --git a/VERSION b/VERSION
index a6333e40..0d3ad67a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.9
+2.2.10
diff --git a/entrypoint.sh b/entrypoint.sh
index c1691007..29eef667 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 check_bundle() {
-    bundle check || bundle install -j "$(nproc)"
+    bundle config set path /gems && bundle check || bundle install -j "$(nproc)"
 }
 
 cd /app || exit