Skip to content

Commit

Permalink
bump version; docker improvements
Browse files Browse the repository at this point in the history
Allow building against different rubies via RUBY_VERSION build arg
  • Loading branch information
Adam Constabaris committed May 23, 2023
1 parent e36779c commit 6548091
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.9
2.2.10
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6548091

Please sign in to comment.