From 7d78a96e355296ca841537ae446de2d0b5c55e51 Mon Sep 17 00:00:00 2001 From: Guntis Smaukstelis Date: Thu, 28 Dec 2023 12:11:08 +0200 Subject: [PATCH] Fix in docker-comose, binding changes --- .gitignore | 1 + README.md | 4 ++-- docker-compose.yml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8fa3603..ffa3cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ src/main/resources/application.conf +postgres/ target/ project/target/ diff --git a/README.md b/README.md index cabb7ad..295426d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ docker-compose up scala --build ``` ## Web -[http://0.0.0.0:9080/](http://0.0.0.0:9080/) +[http://0.0.0.0:9090/](http://0.0.0.0:9090/) ## nginx proxy config ``` @@ -21,7 +21,7 @@ server { server_name laikazinas.lsm.lv; location / { - proxy_pass http://localhost:9080; # Forward requests to the Scala app + proxy_pass http://localhost:9090; # Forward requests to the Scala app proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/docker-compose.yml b/docker-compose.yml index 6d6638f..ef93180 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: ports: - "5432:5432" healthcheck: - test: [ "CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${DATABASE_USER}" ] + test: [ "CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}" ] interval: 5s timeout: 5s retries: 5 @@ -20,7 +20,7 @@ services: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} volumes: - - /var/lib/postgresql/data:/var/lib/postgresql/data + - ./postgres:/var/lib/postgresql/data scala: environment: @@ -36,6 +36,6 @@ services: volumes: - ./:/app ports: - - "9080:8080" + - "9090:8080" depends_on: - postgres \ No newline at end of file