diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 0e82f4d..173dc3d 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 2bf5bf6..00d1817 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 e2f8774..36a7346 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -416,4 +416,4 @@ DEPENDENCIES zoo_stream (~> 1.0) BUNDLED WITH - 1.17.3 + 2.4.22