From a87efbac7861935a7e5a4787d3595608639bdcc3 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:17:26 +0200 Subject: [PATCH 1/7] Upgrade gems --- app/Gemfile | 4 ++-- app/Gemfile.lock | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/Gemfile b/app/Gemfile index 1ce0dc3..e16d77e 100644 --- a/app/Gemfile +++ b/app/Gemfile @@ -3,10 +3,10 @@ source 'https://rubygems.org' ruby '2.6.3' # A simple, fast Mysql library for Ruby, binding to libmysql. -gem 'mysql2', '~> 0.5.2' +gem 'mysql2', '~> 0.5' # Pg is the Ruby interface to the PostgreSQL. -gem 'pg', '~> 0.18.4' +gem 'pg', '~> 1.3' # Gemstash acts as a local RubyGems server, caching copies of gems from # RubyGems.org automatically, and eventually letting you push your own private diff --git a/app/Gemfile.lock b/app/Gemfile.lock index 12acf7b..b08c45f 100644 --- a/app/Gemfile.lock +++ b/app/Gemfile.lock @@ -1,44 +1,46 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - concurrent-ruby (1.1.7) - dalli (2.7.10) - faraday (0.15.4) + concurrent-ruby (1.1.10) + dalli (2.7.11) + faraday (0.17.5) multipart-post (>= 1.2, < 3) - faraday_middleware (0.13.1) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) - gemstash (2.0.0) + gemstash (2.1.0) activesupport (>= 4.2, < 6) dalli (~> 2.7) faraday (~> 0.9) faraday_middleware (~> 0.10) lru_redux (~> 1.1) - puma (~> 3.10) + puma (~> 4.0) sequel (~> 5.0) server_health_check-rack (~> 0.1) sinatra (>= 1.4, < 3.0) sqlite3 (~> 1.3) thor (~> 0.20) - i18n (1.8.5) + i18n (1.10.0) concurrent-ruby (~> 1.0) lru_redux (1.1.0) - minitest (5.14.2) - multipart-post (2.0.0) + minitest (5.15.0) + multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - mysql2 (0.5.2) - pg (0.18.4) - puma (3.12.6) + mysql2 (0.5.4) + nio4r (2.5.8) + pg (1.3.5) + puma (4.3.12) + nio4r (~> 2.0) rack (2.2.3) rack-protection (2.2.0) rack ruby2_keywords (0.0.5) - sequel (5.19.0) + sequel (5.56.0) server_health_check (1.0.2) server_health_check-rack (0.1.0) server_health_check (~> 1.0, >= 1.0.1) @@ -47,11 +49,11 @@ GEM rack (~> 2.2) rack-protection (= 2.2.0) tilt (~> 2.0) - sqlite3 (1.4.1) + sqlite3 (1.4.2) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) PLATFORMS @@ -59,11 +61,11 @@ PLATFORMS DEPENDENCIES gemstash (~> 2.0) - mysql2 (~> 0.5.2) - pg (~> 0.18.4) + mysql2 (~> 0.5) + pg (~> 1.3) RUBY VERSION ruby 2.6.3p62 BUNDLED WITH - 1.17.2 + 1.17.3 From 1d276f95489ee8e8fa3082b4609f5c58c7ddf486 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:17:59 +0200 Subject: [PATCH 2/7] Build images locally --- docker-compose.mysql.yml | 3 ++- docker-compose.postgres.yml | 3 ++- docker-compose.sqlite.yml | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 51dde31..4736a0c 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -2,7 +2,8 @@ version: '2.1' services: gemstash: - image: zappi/gemstash:1.2.0 + build: . + image: zappi/gemstash:latest environment: RACK_ENV: production GEMSTASH_DB_ADAPTER: mysql2 diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index bde3a10..f557287 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -2,7 +2,8 @@ version: '2.1' services: gemstash: - image: zappi/gemstash:1.2.0 + build: . + image: zappi/gemstash:latest environment: RACK_ENV: production GEMSTASH_DB_ADAPTER: postgres diff --git a/docker-compose.sqlite.yml b/docker-compose.sqlite.yml index fc4d019..0ce0849 100644 --- a/docker-compose.sqlite.yml +++ b/docker-compose.sqlite.yml @@ -2,10 +2,8 @@ version: '2.1' services: gemstash: - build: - context: . - dockerfile: Dockerfile - image: zappi/gemstash:1.2.0 + build: . + image: zappi/gemstash:latest environment: RACK_ENV: production ports: From d38e0bd3b6acbfa45ec055cf31cee32b9b2a9ac2 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:23:39 +0200 Subject: [PATCH 3/7] Upgrade to Ruby 3.1.2 --- app/.ruby-version | 2 +- app/Gemfile | 2 +- app/Gemfile.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/.ruby-version b/app/.ruby-version index ec1cf33..ef538c2 100644 --- a/app/.ruby-version +++ b/app/.ruby-version @@ -1 +1 @@ -2.6.3 +3.1.2 diff --git a/app/Gemfile b/app/Gemfile index e16d77e..5689e12 100644 --- a/app/Gemfile +++ b/app/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.6.3' +ruby '3.1.2' # A simple, fast Mysql library for Ruby, binding to libmysql. gem 'mysql2', '~> 0.5' diff --git a/app/Gemfile.lock b/app/Gemfile.lock index b08c45f..a02eee2 100644 --- a/app/Gemfile.lock +++ b/app/Gemfile.lock @@ -65,7 +65,7 @@ DEPENDENCIES pg (~> 1.3) RUBY VERSION - ruby 2.6.3p62 + ruby 3.1.2p20 BUNDLED WITH - 1.17.3 + 2.3.13 From 3428a5400bdabe2253aa2dc673c1e1eb3878aef3 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:50:49 +0200 Subject: [PATCH 4/7] Upgrade compose images --- docker-compose.mysql.yml | 2 +- docker-compose.postgres.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 4736a0c..7f4262f 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -23,7 +23,7 @@ services: mysql: condition: service_healthy mysql: - image: mysql:5.7.19 + image: mysql:5.7.37 volumes: - mysql_data:/var/lib/mysql expose: diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index f557287..88b4891 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -20,7 +20,7 @@ services: links: - postgres postgres: - image: postgres:9.6.3-alpine + image: postgres:10.18-alpine volumes: - postgres_data:/var/lib/mysql expose: From 4b18f61b150cc835fe67dcb306702a0d4d015746 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:51:14 +0200 Subject: [PATCH 5/7] Upgrade base image to use Ruby 3.1.2 --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13deee2..ed6b8a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.3-alpine +FROM ruby:3.1.2-alpine # Install system dependencies RUN apk --update add \ @@ -9,7 +9,7 @@ RUN apk --update add \ su-exec \ tini && \ gem update --system && \ - gem install bundler:1.17.2 && \ + gem install bundler:2.3.13 && \ rm -rf /var/cache/apk/* # Create gemstash user @@ -24,9 +24,11 @@ WORKDIR "${GEMSTASH_HOME}/app" COPY "app/" "${GEMSTASH_HOME}/app" RUN bundle install --jobs 4 --retry 3 -VOLUME "${GEMSTASH_HOME}/data" +USER ${GEMSTASH_USER}:${GEMSTASH_USER} +RUN mkdir -p "${GEMSTASH_HOME}/data" +VOLUME "${GEMSTASH_HOME}/data" EXPOSE 9292 -USER ${GEMSTASH_USER}:${GEMSTASH_USER} + ENTRYPOINT ["tini", "--"] CMD ["bundle", "exec", "gemstash", "start", "--no-daemonize", "--config-file=config.yml.erb"] From b04661ef6ebc6420062dc32b2c7513ff941ce417 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 11:52:23 +0200 Subject: [PATCH 6/7] Update changelog --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89ac7e3..d9be05e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 1.5.0 + +* Upgrade Ruby to v3.1.2. +* Upgrade Bundler to v2.3.13. +* Upgrade Gemstash to v2.1.0. +* Bump activesupport from 5.2.4.4 to 5.2.8. +* Bump concurrent-ruby from 1.1.7 to 1.1.10. +* Bump dalli from 2.7.10 to 2.7.11. +* Bump faraday from 0.15.4 to 0.17.5. +* Bump faraday_middleware from 0.13.1 to 0.14.0. +* Bump i18n from 1.8.5 to 1.10.0. +* Bump minitest from 5.14.2 to 5.15.0. +* Bump multipart-post from 2.0.0 to 2.1.1. +* Bump mysql2 from 0.5.2 to 0.5.4. +* Bump pg from 0.18.4 to 1.3.5. +* Bump puma from 3.12.6 to 4.3.12. +* Bump sequel from 5.19.0 to 5.56.0. +* Bump sinatra from 2.0.5 to 2.2.0. +* Bump sqlite3 from 1.4.1 to 1.4.2. +* Bump tzinfo from 1.2.7 to 1.2.9. + ## 1.4.1 * Bump puma from 3.12.1 to 3.12.6. From a46977aa826266c3e22965f52f014ecc5504ae27 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Tue, 10 May 2022 12:23:07 +0200 Subject: [PATCH 7/7] Update codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 0db5bca..f83760b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @Intellection/devops +* @Intellection/SRE