Update bundler and dockerfile to run ruby 2.7 bundler v2 and update s…

…taging gh action to use non-next dockerfile build
zooniverse · Dec 13, 2024 · 2b3a446 · 2b3a446
1 parent ca176d1
commit 2b3a446
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
@@ -12,8 +12,7 @@ jobs:
     uses: zooniverse/ci-cd/.github/workflows/build_and_push_image.yaml@main
     with:
       repo_name: talk-api
-      commit_id: ${{ github.sha }}-next
-      file: Dockerfile.rails-next
+      commit_id: ${{ github.sha }}
       latest: true
 
   db_migration_staging:
@@ -23,7 +22,7 @@ jobs:
     with:
       app_name: talk-api
       environment: staging
-      commit_id: ${{ github.sha }}-next
+      commit_id: ${{ github.sha }}
     secrets:
       creds: ${{ secrets.AZURE_AKS }}
 
@@ -34,7 +33,7 @@ jobs:
     with:
       app_name: talk-api
       repo_name: talk-api
-      commit_id: ${{ github.sha }}-next
+      commit_id: ${{ github.sha }}
       environment: staging
     secrets:
       creds: ${{ secrets.AZURE_AKS }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-slim-buster
+FROM ruby:2.7-slim-buster
 
 WORKDIR /rails_app
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -416,4 +416,4 @@ DEPENDENCIES
   zoo_stream (~> 1.0)
 
 BUNDLED WITH
-   1.17.3
+   2.4.22
-Original file line number
+Diff line change
@@ Expand Up / @@ -416,4 +416,4 @@ DEPENDENCIES @@
       zoo_stream (~> 1.0)
     BUNDLED WITH
-.17.3
+.4.22