Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/2024.3.0' into release/2024.3.0
- Loading branch information
Showing
84 changed files
with
4,289 additions
and
604 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# THIS IS NOT TO BE USED FOR PERSONAL DEPLOYMENTS! | ||
# Internal Docker Compose Image used for internal testing deployments | ||
|
||
version: "3.7" | ||
|
||
services: | ||
hoppscotch-db: | ||
image: postgres:15 | ||
user: postgres | ||
environment: | ||
POSTGRES_USER: postgres | ||
POSTGRES_PASSWORD: testpass | ||
POSTGRES_DB: hoppscotch | ||
healthcheck: | ||
test: | ||
[ | ||
"CMD-SHELL", | ||
"sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'" | ||
] | ||
interval: 5s | ||
timeout: 5s | ||
retries: 10 | ||
|
||
hoppscotch-aio: | ||
container_name: hoppscotch-aio | ||
build: | ||
dockerfile: prod.Dockerfile | ||
context: . | ||
target: aio | ||
environment: | ||
- DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch | ||
- ENABLE_SUBPATH_BASED_ACCESS=true | ||
env_file: | ||
- ./.env | ||
depends_on: | ||
hoppscotch-db: | ||
condition: service_healthy | ||
command: ["sh", "-c", "pnpm exec prisma migrate deploy && node /usr/src/app/aio_run.mjs"] | ||
healthcheck: | ||
test: | ||
- CMD | ||
- curl | ||
- '-f' | ||
- 'http://localhost:80' | ||
interval: 2s | ||
timeout: 10s | ||
retries: 30 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.