Skip to content

Commit

Permalink
feat: Enabling /impact-sphere subdirectory at url
Browse files Browse the repository at this point in the history
  • Loading branch information
martintomas committed Dec 11, 2023
1 parent 0ef91c7 commit a05ff06
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
env:
IMAGE_NAME: ${{ env.PROJECT_NAME }}-${{ steps.extract_branch.outputs.branch == 'main' && 'production' || 'staging' }}-client
run: |
docker build $(cat client/.env.local | xargs -I {} echo --build-arg {}) -f client/Dockerfile.prod -t $IMAGE_REGISTRY/$IMAGE_NAME:$GITHUB_SHA .
docker build -f client/Dockerfile.prod -t $IMAGE_REGISTRY/$IMAGE_NAME:$GITHUB_SHA .
- name: Install doctl
uses: digitalocean/action-doctl@v2
Expand Down
10 changes: 5 additions & 5 deletions infrastructure/base/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ locals {
ADMIN_JWT_SECRET = random_password.admin_jwt_secret.result
TRANSFER_TOKEN_SALT = random_password.transfer_token_salt.result
JWT_SECRET = random_password.jwt_secret.result
CMS_URL = "${module.staging.app_url}/cms"
STRAPI_ADMIN_API_BASE_URL = "${module.staging.app_url}/cms/api"
CMS_URL = "${module.staging.app_url}/impact-sphere/cms"
STRAPI_ADMIN_API_BASE_URL = "${module.staging.app_url}/impact-sphere/cms/api"
STRAPI_ADMIN_MAPBOX_ACCESS_TOKEN = var.mapbox_api_token
STRAPI_MEDIA_LIBRARY_PROVIDER = "digitalocean"

Expand All @@ -64,10 +64,10 @@ locals {

}
staging_client_env = {
NEXT_PUBLIC_URL = module.staging.app_url
NEXT_PUBLIC_BASE_PATH = ""
NEXT_PUBLIC_URL = "${module.staging.app_url}/impact-sphere"
NEXT_PUBLIC_BASE_PATH = "/impact-sphere"
NEXT_PUBLIC_ENVIRONMENT = "production"
NEXT_PUBLIC_API_URL = "${module.staging.app_url}/cms/api"
NEXT_PUBLIC_API_URL = "${module.staging.app_url}/impact-sphere/cms/api"
NEXT_PUBLIC_GA_TRACKING_ID = var.ga_tracking_id
NEXT_PUBLIC_MAPBOX_API_TOKEN = var.mapbox_api_token
LOG_LEVEL = "info"
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/base/modules/app/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resource "digitalocean_app" "app" {
}

routes {
path = "/"
path = "/impact-sphere"
preserve_path_prefix = false
}
}
Expand All @@ -68,7 +68,7 @@ resource "digitalocean_app" "app" {
}

routes {
path = "/cms"
path = "/impact-sphere/cms"
preserve_path_prefix = false
}
}
Expand Down

0 comments on commit a05ff06

Please sign in to comment.