diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6124bfaf..dc8b8350 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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). diff --git a/bin/sync-db.sh b/bin/sync-db.sh index e54bf885..d1032573 100755 --- a/bin/sync-db.sh +++ b/bin/sync-db.sh @@ -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" diff --git a/docker-compose.integrated.yml b/compose.integrated.yaml similarity index 94% rename from docker-compose.integrated.yml rename to compose.integrated.yaml index f66111b3..72b0c711 100644 --- a/docker-compose.integrated.yml +++ b/compose.integrated.yaml @@ -1,7 +1,5 @@ -version: '3.3' services: api: - container_name: hpc_api build: context: . dockerfile: ./env/api/Dockerfile diff --git a/docker-compose.yml b/compose.yaml similarity index 89% rename from docker-compose.yml rename to compose.yaml index 1c17f353..7a58fa81 100644 --- a/docker-compose.yml +++ b/compose.yaml @@ -1,7 +1,5 @@ -version: '3.8' services: api: - container_name: hpc_api build: context: . dockerfile: ./env/api/Dockerfile @@ -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 diff --git a/package.json b/package.json index 6fda1312..0a621858 100644 --- a/package.json +++ b/package.json @@ -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",