Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WSTEAMA-1458 - Setup static assets for 2nd preview environment #12215

Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1f45d92
rename file from preview to preview1
louisearchibald Nov 28, 2024
636b1fe
amend simorgh public static assets paths to reflect preview1 rename
louisearchibald Nov 28, 2024
44b0d58
update preview build script to preview1
louisearchibald Nov 28, 2024
87aa46d
create a .env file for preview2
louisearchibald Nov 28, 2024
211ffac
add a build script for preview2
louisearchibald Nov 28, 2024
bf31a65
move numbers to correct place in path
louisearchibald Nov 28, 2024
6a11f87
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Nov 28, 2024
21355bd
test commit
louisearchibald Nov 29, 2024
af7006e
Merge branch 'WSTEAMA-1458-setup-static-assets-for-2nd-preview-enviro…
louisearchibald Nov 29, 2024
04cf1f8
Revert "test commit"
louisearchibald Nov 29, 2024
b36cbc8
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 5, 2024
40ee685
Merge branch 'WSTEAMA-1458-setup-static-assets-for-2nd-preview-enviro…
louisearchibald Dec 5, 2024
05c2d33
Add backwards compatible preview command
andrewscfc Dec 5, 2024
81838cb
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 5, 2024
161a435
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 6, 2024
b43b6b6
Merge branch 'WSTEAMA-1458-setup-static-assets-for-2nd-preview-enviro…
louisearchibald Dec 6, 2024
567094b
updates build preview path for next app
louisearchibald Dec 6, 2024
f9e4c18
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 6, 2024
6280bec
Merge branch 'WSTEAMA-1458-setup-static-assets-for-2nd-preview-enviro…
louisearchibald Dec 6, 2024
00a1e08
add preview1 & preview2 build preview scripts for next app
louisearchibald Dec 6, 2024
e206aef
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 10, 2024
cc11023
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 10, 2024
5bba719
Merge branch 'WSTEAMA-1458-setup-static-assets-for-2nd-preview-enviro…
louisearchibald Dec 10, 2024
a634dc5
Merge branch 'latest' of github.com:bbc/simorgh into latest
louisearchibald Dec 10, 2024
dd37271
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 10, 2024
5f96643
Merge branch 'latest' into WSTEAMA-1458-setup-static-assets-for-2nd-p…
louisearchibald Dec 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion envConfig/preview.env → envConfig/preview1.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## NB only variables prefixed with SIMORGH_ are available on both the server and client
SIMORGH_BASE_URL=https://www.test.bbc.com
SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-preview-assets/public/
SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-preview1-assets/public/
louisearchibald marked this conversation as resolved.
Show resolved Hide resolved
SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
Expand Down
32 changes: 32 additions & 0 deletions envConfig/preview2.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## NB only variables prefixed with SIMORGH_ are available on both the server and client
SIMORGH_BASE_URL=https://www.test.bbc.com
SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-preview2-assets/public/
louisearchibald marked this conversation as resolved.
Show resolved Hide resolved
SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
SIMORGH_ICHEF_BASE_URL=https://ichef.test.bbci.co.uk
LOG_DIR='/var/log/simorgh'
LOG_LEVEL='debug'
LOG_TO_CONSOLE=false
SIMORGH_APP_ENV=test
SIMORGH_CONFIG_CACHE_ITEMS=400
SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS=300
SIMORGH_CONFIG_TIMEOUT_SECONDS=1
SERVER_KEEP_ALIVE_TIMEOUT=61000
SERVER_HEADERS_TIMEOUT=65000
SIMORGH_MOST_READ_CDN_URL=https://web-cdn.test.api.bbci.co.uk

## CW Custom Metrics Configuration
AWS_EMF_SERVICE_NAME=Simorgh
AWS_EMF_LOG_GROUP_NAME=SimorghServer
AWS_EMF_ENVIRONMENT=EC2

## WebVitals Reporting
SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint
SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE=100

SIMORGH_CSP_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint

SIMORGH_OPTIMIZELY_SDK_KEY=LptPKDnHyAFu9V12s5xCz
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"build:profile": "rm -rf build && cp envConfig/local.env .env && IS_PROD_PROFILE=true NODE_ENV=production webpack",
"build:live": "cp envConfig/live.env .env && NODE_ENV=production webpack",
"build:live:debug": "rm -rf build && awk '{sub(/LOG_DIR=.+/,\"LOG_DIR='log'\")}1' envConfig/live.env > .env && NODE_ENV=production webpack",
"build:preview": "cp envConfig/preview.env .env && NODE_ENV=production webpack",
"build:preview1": "cp envConfig/preview1.env .env && NODE_ENV=production webpack",
andrewscfc marked this conversation as resolved.
Show resolved Hide resolved
"build:preview2": "cp envConfig/preview2.env .env && NODE_ENV=production webpack",
"build:storybook": "yarn build && node .storybook/buildFontPreloads && storybook build -c .storybook -o storybook_dist",
"build:test": "cp envConfig/test.env .env && NODE_ENV=production webpack",
"build:test:debug": "rm -rf build && awk '{sub(/LOG_DIR=.+/,\"LOG_DIR='log'\")}1' envConfig/test.env > .env && NODE_ENV=production webpack",
Expand Down
Loading