chore: remove unused marketplace configuration
Build & Deploy / Build & Push Docker Image (push) Successful in 3m9s
Test / Type Check (all packages) (push) Successful in 56s
Build & Deploy / Deploy to VPS (push) Successful in 4s
Test / API Unit Tests (push) Failing after 49s
Test / Homepage Unit Tests (push) Successful in 42s
Test / Storefront Unit Tests (push) Failing after 40s
Test / Admin Unit Tests (push) Successful in 40s
Test / Dashboard Unit Tests (push) Failing after 41s
Test / API Integration Tests (push) Successful in 1m0s
Build & Deploy / Build & Push Docker Image (push) Successful in 3m9s
Test / Type Check (all packages) (push) Successful in 56s
Build & Deploy / Deploy to VPS (push) Successful in 4s
Test / API Unit Tests (push) Failing after 49s
Test / Homepage Unit Tests (push) Successful in 42s
Test / Storefront Unit Tests (push) Failing after 40s
Test / Admin Unit Tests (push) Successful in 40s
Test / Dashboard Unit Tests (push) Failing after 41s
Test / API Integration Tests (push) Successful in 1m0s
This commit is contained in:
@@ -48,8 +48,6 @@ NEXT_PUBLIC_API_URL=https://api.rentaldrivego.ma/api/v1
|
||||
|
||||
# Frontend public URLs
|
||||
SITE_ORIGIN=https://rentaldrivego.ma
|
||||
NEXT_PUBLIC_MARKETING_URL=https://rentaldrivego.ma
|
||||
NEXT_PUBLIC_MARKETPLACE_URL=https://rentaldrivego.ma
|
||||
NEXT_PUBLIC_HOMEPAGE_URL=https://rentaldrivego.ma
|
||||
NEXT_PUBLIC_CARPLACE_URL=https://rentaldrivego.ma/carplace
|
||||
NEXT_PUBLIC_DASHBOARD_URL=https://rentaldrivego.ma/dashboard
|
||||
|
||||
@@ -55,9 +55,8 @@ services:
|
||||
DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
@@ -88,9 +87,8 @@ services:
|
||||
DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
@@ -114,6 +112,7 @@ services:
|
||||
environment:
|
||||
DATABASE_URL_FROM_POSTGRES: ${DATABASE_URL_FROM_POSTGRES:-true}
|
||||
FILE_STORAGE_ROOT: /var/lib/rentaldrivego/storage
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
|
||||
POSTGRES_PORT: ${POSTGRES_PORT:-5432}
|
||||
POSTGRES_DB: ${POSTGRES_DB:-rentaldrivego}
|
||||
@@ -148,8 +147,7 @@ services:
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
@@ -191,9 +189,8 @@ services:
|
||||
DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
@@ -235,9 +232,8 @@ services:
|
||||
DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
@@ -279,9 +275,8 @@ services:
|
||||
DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
|
||||
ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
|
||||
NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
|
||||
NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
|
||||
NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
|
||||
NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
|
||||
NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
|
||||
SITE_ORIGIN: ${SITE_ORIGIN}
|
||||
|
||||
@@ -102,6 +102,15 @@ export_compose_env_from_file() {
|
||||
export "${key}=${value}"
|
||||
fi
|
||||
done < "${ENV_FILE}"
|
||||
|
||||
if [[ -z "${NEXT_PUBLIC_CARPLACE_URL:-}" ]]; then
|
||||
if [[ -n "${NEXT_PUBLIC_STOREFRONT_URL:-}" ]]; then
|
||||
NEXT_PUBLIC_CARPLACE_URL="${NEXT_PUBLIC_STOREFRONT_URL%/}/carplace"
|
||||
elif [[ -n "${SITE_ORIGIN:-}" ]]; then
|
||||
NEXT_PUBLIC_CARPLACE_URL="${SITE_ORIGIN%/}/carplace"
|
||||
fi
|
||||
export NEXT_PUBLIC_CARPLACE_URL
|
||||
fi
|
||||
}
|
||||
|
||||
load_prod_env_exports() {
|
||||
|
||||
Reference in New Issue
Block a user