Skip to content

Commit

Permalink
Merge branch 'dev' into IN-945-service-edit-page
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Feb 27, 2024
2 parents 4ba39c9 + 387c2e8 commit 84fc7e5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ COGNITO_CLIENT_ID=
COGNITO_CLIENT_SECRET=

GOOGLE_PLACES_API_KEY=
NEXT_PUBLIC_GOOGLE_MAPS_API=
NEXT_PUBLIC_GOOGLE_MAPS_API=$GOOGLE_PLACES_API_KEY

NEXT_PUBLIC_GA_MEASUREMENT_ID=''

# Vercel edge config
EDGE_CONFIG=

## Storybook Figma Plugin
##
Expand Down
2 changes: 1 addition & 1 deletion apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:prebuild": "SKIP_ENV_VALIDATION=true tsx ./lib/prebuild.ts",
"clean:node": "rm -rf ./node_modules/ || true && rm -rf ./.next || true",
"predev": "pnpm -w docker:up",
"dev": "next dev",
"dev": "pnpm with-env next dev",
"postdev": "pnpm -w docker:down",
"dev:verbose": "NEXT_VERBOSE=1 next dev",
"format": "prettier --write --ignore-unknown .",
Expand Down
13 changes: 12 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ services:
container_name: InReach-redis
ports:
- '6379:6379'
command: redis-server --save 20 1 --loglevel warning --requirepass password
volumes:
- cache:/data
# Redis serverless proxy (to emulate @vercel/kv)
Expand All @@ -71,6 +70,17 @@ services:
SRH_MODE: env
SRH_TOKEN: 7fkVoJi4o/NtjkBTCVPXg4jSC/9Ib6H/ZCmUZfcy0IQ=
SRH_CONNECTION_STRING: 'redis://redis:6379'
redis-insight:
container_name: InReach-redis-insight
image: redislabs/redisinsight:latest
pull_policy: always
restart: unless-stopped
depends_on:
- redis
ports:
- 8001:5540
volumes:
- redis_insight:/db

configs:
pgAdmin-pgpass:
Expand All @@ -84,3 +94,4 @@ volumes:
pgadmin: {}
cache:
driver: local
redis_insight: {}
2 changes: 2 additions & 0 deletions packages/db/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ seed/recon/generated/*.json
seed/recon/output/**/*.json
seed/recon/input/**/*.json

.snaplet/snapshots

prisma/generated
prisma/dbml
prisma/data-migrations/**/!*.json
Expand Down

0 comments on commit 84fc7e5

Please sign in to comment.