Skip to content

Commit

Permalink
Merge pull request #228 from UN-OCHA/env/stage
Browse files Browse the repository at this point in the history
πŸš€ Release `v4.6.1` and deploy to production
  • Loading branch information
Delgee authored Dec 14, 2023
2 parents 0dbf8ea + 8e55024 commit 3b95e8b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This repository can be run as a standalone application or as part of [hpc-suite]
### Standalone

To run this projects docker containers:
`docker-compose up -d`
`docker compose up -d`

This will spin up the server and a postgres database. To restore data to this database see the [section below](#Restore_database).

Expand Down
2 changes: 1 addition & 1 deletion bin/sync-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ DROP SCHEMA public CASCADE; \
GRANT CREATE ON SCHEMA public to postgres;" $PG_DB_NAME

# Because we are using Postgre container specified elsewhere,
# outside of docker-compose.yaml in this repo, we must manually
# outside of compose.yaml in this repo, we must manually
# move the downloaded dumps into postgre container.
# Ideally, local dumps directory should be mounted in PG container's `volumes`
echo "Copy DB snapshot file to Postgre container"
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.integrated.yml β†’ compose.integrated.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
version: '3.3'
services:
api:
container_name: hpc_api
build:
context: .
dockerfile: ./env/api/Dockerfile
Expand Down
5 changes: 1 addition & 4 deletions docker-compose.yml β†’ compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
version: '3.8'
services:
api:
container_name: hpc_api
build:
context: .
dockerfile: ./env/api/Dockerfile
Expand All @@ -26,8 +24,7 @@ services:
depends_on:
- db
db:
image: postgres:11.7
container_name: hpc_postgres_db
image: postgres:14.8-alpine3.18
environment:
- POSTGRES_PASSWORD=demo
- POSTGRES_USER=demo
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hpc-api",
"version": "4.6.0",
"version": "4.6.1",
"description": "api for HPC applications",
"main": "src/server.ts",
"license": "MIT",
Expand Down

0 comments on commit 3b95e8b

Please sign in to comment.