diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 32ac2bd88..2ab1b2cca 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -7,7 +7,7 @@ on: pull_request: workflow_dispatch: -concurrency: 'sandbox' +concurrency: 'staging' defaults: run: @@ -95,7 +95,7 @@ jobs: name: Deploy runs-on: ubuntu-latest - environment: 'sandbox' + environment: 'staging' if: github.ref == 'refs/heads/main' needs: [lint, test] diff --git a/config/database.yml b/config/database.yml index d7a80c837..f04b2a776 100644 --- a/config/database.yml +++ b/config/database.yml @@ -31,7 +31,7 @@ development: database: data_collector_development host: localhost -sandbox: +staging: <<: *default # The specified database role being used to connect to postgres. diff --git a/config/environments/sandbox.rb b/config/environments/staging.rb similarity index 100% rename from config/environments/sandbox.rb rename to config/environments/staging.rb diff --git a/config/webpack/sandbox.js b/config/webpack/staging.js similarity index 62% rename from config/webpack/sandbox.js rename to config/webpack/staging.js index e1b3b9625..93eb5804b 100644 --- a/config/webpack/sandbox.js +++ b/config/webpack/staging.js @@ -1,4 +1,4 @@ -process.env.NODE_ENV = process.env.NODE_ENV || 'sandbox' +process.env.NODE_ENV = process.env.NODE_ENV || 'staging' const environment = require('./environment') diff --git a/config/webpacker.yml b/config/webpacker.yml index 11e9c283c..f388bc5ec 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -95,7 +95,7 @@ test: public_output_path: packs-test -sandbox: +staging: <<: *default production: diff --git a/docs/api/DLUHC-CORE-Data.v1.json b/docs/api/DLUHC-CORE-Data.v1.json index c400a0077..d5394f06a 100644 --- a/docs/api/DLUHC-CORE-Data.v1.json +++ b/docs/api/DLUHC-CORE-Data.v1.json @@ -8,7 +8,7 @@ "servers": [ { "url": "https://dluhc-core.london.cloudapps.digital", - "description": "Sandbox" + "description": "Staging" } ], "paths": { diff --git a/manifest.yml b/manifest.yml index c04f027a7..f314d16b1 100644 --- a/manifest.yml +++ b/manifest.yml @@ -4,11 +4,11 @@ applications: buildpacks: - https://github.com/cloudfoundry/ruby-buildpack.git env: - RAILS_ENV: sandbox + RAILS_ENV: staging processes: - type: web command: rake db:migrate && bin/rails server instances: 2 memory: 512M services: - - dluhc-core-sandbox-postgres + - dluhc-core-staging-postgres