1 Commits

Author SHA1 Message Date
8dd914c6c2 Committing work fixing issues found while testing on dev1.bookmarks
All checks were successful
ci/woodpecker/tag/api_build Pipeline was successful
ci/woodpecker/tag/api_uploadimage Pipeline was successful
ci/woodpecker/tag/web_uploadimage Pipeline was successful
ci/woodpecker/push/api_build Pipeline was successful
- Modified EnvironmentUtils to fix proper casing for getting ASPNETCore_Environment
- On Web, modify package.json to delete 'homepage': '.', line to fix issue with app not serving up subroutes. See: https://stackoverflow.com/questions/63036631/nginx-returning-404-when-trying-get-subroute-in-dockerized-react-app
- Added docker-compose for easier setup and deployment of local docker containers
2024-04-08 23:12:16 -05:00
4 changed files with 39 additions and 3 deletions

1
.gitignore vendored
View File

@ -248,5 +248,4 @@ yarn-debug.log*
yarn-error.log* yarn-error.log*
.env .env
Logs/* Logs/*
docker-compose.yml
*exclude* *exclude*

View File

@ -4,6 +4,6 @@ namespace YABA.Common.Utils
{ {
public static class EnvironmentUtils public static class EnvironmentUtils
{ {
public static bool IsDevelopmentEnvironment() => Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development"; public static bool IsDevelopmentEnvironment() => Environment.GetEnvironmentVariable("ASPNETCORE_Environment") == "Development";
} }
} }

View File

@ -2,7 +2,6 @@
"name": "yaba-web", "name": "yaba-web",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"homepage": ".",
"dependencies": { "dependencies": {
"@auth0/auth0-react": "^2.0.0", "@auth0/auth0-react": "^2.0.0",
"@testing-library/jest-dom": "^5.16.5", "@testing-library/jest-dom": "^5.16.5",

38
docker-compose.yaml Normal file
View File

@ -0,0 +1,38 @@
version: "3"
services:
web:
build:
context: ./Web
dockerfile: Dockerfile
args:
REACT_APP_API_BASE_URL: http://localhost:32270/api
REACT_APP_AUTH0_DOMAIN: iwanaga-dev.us.auth0.com
REACT_APP_AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
REACT_APP_AUTH0_CALLBACK_URL: http://localhost:32271/redirect
REACT_APP_AUTH0_AUDIENCE: https://yaba.dev.iwanaga.moe
container_name: yaba_web
restart: unless-stopped
ports:
- 32271:80
depends_on:
- api
api:
build:
context: ./API
dockerfile: YABA.API/Dockerfile
args:
MODE: Debug
container_name: yaba_api
ports:
- 32270:80
environment:
ASPNETCORE_Environment: Development
ASPNETCORE_Authentication__Auth0__ClientId: ${AUTH0_CLIENT_ID}
ASPNETCORE_Authentication__Auth0__ClientSecret: ${AUTH0_CLIENT_SECRET}
ASPNETCORE_Authentication__Auth0__Domain: iwanaga-dev.us.auth0.com
ASPNETCORE_Authentication__Auth0__Identifier: https://yaba.dev.iwanaga.moe
ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString: ${RO_CONNECTION_STRING}
ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString: ${RW_CONNECTION_STRING}
WebClient__Url: http://localhost:32271
Serilog__WriteTo__1__Args__Uri: https://loki.iwanaga.moe
Serilog__WriteTo__1__Args__Labels__1__Value: localhost