From 2b3a4463ef4bd14466f9380c5b21ab62e930599e Mon Sep 17 00:00:00 2001
From: yuenmichelle1 <michelle.dano.yuen@gmail.com>
Date: Fri, 13 Dec 2024 15:03:16 -0600
Subject: [PATCH] Update bundler and dockerfile to run ruby 2.7 bundler v2 and
 update staging gh action to use non-next dockerfile build

---
 .github/workflows/deploy_staging.yml | 7 +++----
 Dockerfile                           | 2 +-
 Gemfile.lock                         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
index 0e82f4dc..173dc3df 100644
--- 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
index 2bf5bf66..00d1817e 100644
--- 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
index e2f8774e..36a7346c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,4 +416,4 @@ DEPENDENCIES
   zoo_stream (~> 1.0)
 
 BUNDLED WITH
-   1.17.3
+   2.4.22