Skip to content

Commit

Permalink
Change envs to work with the revproxy (#563)
Browse files Browse the repository at this point in the history
Co-authored-by: nfpappas-oddball <npappas@oddball>
  • Loading branch information
nfpappas-oddball and nfpappas-oddball authored Jun 21, 2024
1 parent 82a3171 commit 6734d7e
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 6 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/content-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ jobs:
# Certs added for the self hosted runner
env:
NODE_EXTRA_CA_CERTS: /etc/ssl/certs/ca-certificates.crt
APP_ENV: prod
APP_ENV: ${{ inputs.build_type }}


ports:
- 80
volumes:
Expand All @@ -147,8 +149,10 @@ jobs:
uses: actions/checkout@v4
with:
repository: department-of-veterans-affairs/next-build
ref: ${{ needs.validate-build-status.outputs.TAG }}
#ref: ${{ needs.validate-build-status.outputs.TAG }}
ref: ${{ github.head_ref || github.ref_name }}
path: main
sparse-checkout-cone-mode: false

- name: Checkout vets-website
uses: actions/checkout@v4
Expand Down Expand Up @@ -193,7 +197,8 @@ jobs:
retry_on: error
timeout_minutes: 30
command: echo YARN_OUTPUT=$(cd main && yarn export --DRUPAL_CLIENT_ID ${{ secrets.PROD_DRUPAL_CLIENT_ID }} --DRUPAL_CLIENT_SECRET ${{ secrets.PROD_DRUPAL_CLIENT_SECRET }} --no-USE_REDIS) >> $GITHUB_OUTPUT

#command: cd main && yarn export --NEXT_PUBLIC_DRUPAL_BASE_URL https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov --NEXT_IMAGE_DOMAIN https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov --SITE_URL https://www.va.gov --DRUPAL_CLIENT_ID ${{ secrets.PROD_DRUPAL_CLIENT_ID }} --DRUPAL_CLIENT_SECRET ${{ secrets.PROD_DRUPAL_CLIENT_SECRET }} --no-USE_REDIS

- name: Build sitemap
run: cd main && yarn build:sitemap

Expand Down
18 changes: 18 additions & 0 deletions envs/.env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This is the standard lower environment for Content API.
NEXT_PUBLIC_DRUPAL_BASE_URL=https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov
NEXT_IMAGE_DOMAIN=https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov

# Prod bucket for vets-website assets
# NEXT_PUBLIC_ASSETS_URL=https://prod-va-gov-assets.s3-us-gov-west-1.amazonaws.com/generated/
NEXT_PUBLIC_ASSETS_URL=/generated/
SITE_URL=https://www.va.gov

# for Drupal preview
DRUPAL_PREVIEW_SECRET=secret
# store these securely in the build pipeline env
#DRUPAL_CLIENT_ID=Retrieve this from AWS SSM /cms/consumers/next-build/client_id
#DRUPAL_CLIENT_SECRET=Retrieve this from AWS SSM /cms/consumers/next-build/client_secret

# Google Analytics
# These print directly to the page so do not need to store in SSM.
NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID=GTM-WFJWBD
3 changes: 1 addition & 2 deletions envs/.env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ NEXT_IMAGE_DOMAIN=https://prod.cms.va.gov

# Prod bucket for vets-website assets
# NEXT_PUBLIC_ASSETS_URL=https://prod-va-gov-assets.s3-us-gov-west-1.amazonaws.com/generated/
NEXT_PUBLIC_ASSETS_URL=/next-content.www.va.gov/generated/

NEXT_PUBLIC_ASSETS_URL=/generated/
SITE_URL=https://www.va.gov

# for Drupal preview
Expand Down
1 change: 0 additions & 1 deletion envs/.env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ NEXT_PUBLIC_DRUPAL_BASE_URL=https://staging.cms.va.gov/
NEXT_IMAGE_DOMAIN=https://staging.cms.va.gov/

NEXT_PUBLIC_ASSETS_URL=/generated/

# for Drupal preview
DRUPAL_PREVIEW_SECRET=secret
# store these securely in the build pipeline env
Expand Down

0 comments on commit 6734d7e

Please sign in to comment.