diff --git a/Dockerfile b/Dockerfile index 2e83cf1..7519428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.4-alpine +FROM ruby:2.6.6-alpine # Installation path ENV HOME=/pact_broker @@ -7,7 +7,7 @@ ENV HOME=/pact_broker RUN set -ex && \ adduser -h $HOME -s /bin/false -D -S -G root ruby && \ chmod g+w $HOME && \ - apk add --update --no-cache make gcc libc-dev mariadb-dev postgresql-dev sqlite-dev + apk add --update --no-cache make gcc libc-dev mariadb-dev postgresql-dev sqlite-dev git # Install Gems WORKDIR $HOME @@ -15,9 +15,13 @@ COPY pact_broker/Gemfile pact_broker/Gemfile.lock $HOME/ RUN cat Gemfile.lock | grep -A1 "BUNDLED WITH" | tail -n1 | awk '{print $1}' > BUNDLER_VERSION RUN set -ex && \ gem install bundler -v $(cat BUNDLER_VERSION) && \ - bundle install --no-cache --deployment --without='development test' && \ + ls /usr/local/lib/ruby/gems/2.6.0 && \ + gem uninstall --install-dir /usr/local/lib/ruby/gems/2.6.0 -x rake && \ + bundle config set deployment 'true' && \ + bundle config set no-cache 'true' && \ + bundle install --without='development test' && \ rm -rf vendor/bundle/ruby/*/cache .bundle/cache && \ - apk del make gcc libc-dev + apk del make gcc libc-dev git # Install source COPY pact_broker $HOME/ diff --git a/pact_broker/Gemfile b/pact_broker/Gemfile index 8ecdc43..84ea418 100644 --- a/pact_broker/Gemfile +++ b/pact_broker/Gemfile @@ -5,3 +5,4 @@ gem "pg", "~>1.0" gem "puma", "~> 3.12" gem "mysql2", "~>0.3" gem "sqlite3", "~>1.3" +gem "rake", "~> 13.0" diff --git a/pact_broker/Gemfile.lock b/pact_broker/Gemfile.lock index 811907a..15c8552 100644 --- a/pact_broker/Gemfile.lock +++ b/pact_broker/Gemfile.lock @@ -105,6 +105,7 @@ GEM rack (2.2.3) rack-protection (2.0.8.1) rack + rake (13.0.1) randexp (0.1.7) redcarpet (3.5.0) reform (2.3.3) @@ -170,6 +171,7 @@ DEPENDENCIES pact_broker pg (~> 1.0) puma (~> 3.12) + rake (~> 13.0) sqlite3 (~> 1.3) BUNDLED WITH