From 6e0ac795ad819ffee8c1cfd703d73c3fd8a4c7de Mon Sep 17 00:00:00 2001 From: thuangiovn <111517437+thuangiovn@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:58:50 +0700 Subject: [PATCH 1/3] Update docker-compose.yml --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3448f5b..12cd307 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,11 +6,11 @@ services: restart: unless-stopped env_file: ./.env environment: - - POSTGRES_USER=$POSTGRESDB_USER - - POSTGRES_PASSWORD=$POSTGRESDB_ROOT_PASSWORD - - POSTGRES_DB=$POSTGRESDB_DATABASE + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=sa123 + - POSTGRES_DB=bezkoder_db ports: - - $POSTGRESDB_LOCAL_PORT:$POSTGRESDB_DOCKER_PORT + - 5433:5432 volumes: - db:/var/lib/postgres app: @@ -20,7 +20,7 @@ services: restart: unless-stopped env_file: ./.env ports: - - $NODE_LOCAL_PORT:$NODE_DOCKER_PORT + - 6868:8080 environment: - DB_HOST=postgresdb - DB_USER=$POSTGRESDB_USER @@ -31,4 +31,4 @@ services: tty: true volumes: - db: \ No newline at end of file + db: From 92cd6e1cb65fc7a70dcbc430bd02b8d9a6628d90 Mon Sep 17 00:00:00 2001 From: thuangiovn <111517437+thuangiovn@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:00:04 +0700 Subject: [PATCH 2/3] Update docker-compose.yml --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 12cd307..5f4b9bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,10 +23,10 @@ services: - 6868:8080 environment: - DB_HOST=postgresdb - - DB_USER=$POSTGRESDB_USER - - DB_PASSWORD=$POSTGRESDB_ROOT_PASSWORD - - DB_NAME=$POSTGRESDB_DATABASE - - DB_PORT=$POSTGRESDB_DOCKER_PORT + - DB_USER=postgres + - DB_PASSWORD=sa123 + - DB_NAME=bezkoder_db + - DB_PORT=5432 stdin_open: true tty: true From f27d242a696b76b08397860c3f2eabf71c30e05c Mon Sep 17 00:00:00 2001 From: thuangiovn <111517437+thuangiovn@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:01:17 +0700 Subject: [PATCH 3/3] Update server.js --- bezkoder-app/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bezkoder-app/server.js b/bezkoder-app/server.js index 24d9856..783b4d4 100644 --- a/bezkoder-app/server.js +++ b/bezkoder-app/server.js @@ -31,7 +31,7 @@ db.sequelize.sync() // simple route app.get("/", (req, res) => { - res.json({ message: "Welcome to bezkoder application." }); + res.json({ message: "Welcome to tailwind application." }); }); require("./app/routes/turorial.routes")(app);