From 96fb0d3eab041c6ef88ef83856cf107e56909df6 Mon Sep 17 00:00:00 2001 From: Florian Sylvain Date: Thu, 10 Nov 2022 12:48:54 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20-=20DB=20full=20init=20?= =?UTF-8?q?first=20time=20it=20starts=20w/=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- docker-compose.yml | 30 ++++++++++++++++++------------ package.json | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app.js b/app.js index 36fea70..3515702 100644 --- a/app.js +++ b/app.js @@ -5,7 +5,7 @@ import { showsRouter } from './routes/shows.js' dotenv.config() const app = express() -const port = process.env.CINEALLO_PORT +const port = 3000 app.use(logger('dev')) app.use(express.json()) diff --git a/docker-compose.yml b/docker-compose.yml index 1936808..059a628 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,4 @@ services: - backend: - build: . - image: cineallo-backend - env_file: - - .env - networks: - - back-net - ports: - - 3000:3000 db: image: mysql:8.0.31 env_file: @@ -19,8 +10,23 @@ services: - "MYSQL_DATABASE=${MYSQL_DATABASE}" volumes: - ./mysql-data:/var/lib/mysql - # ports: - # - 3306:3306 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:3306" ] + interval: 5s + timeout: 15s + retries: 5 + backend: + build: . + image: cineallo-backend + depends_on: + db: + condition: service_healthy + env_file: + - .env + networks: + - back-net + ports: + - "${CINEALLO_PORT}:3000" networks: - back-net: \ No newline at end of file + back-net: diff --git a/package.json b/package.json index e1e91b6..93868be 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "scripts": { - "start": "node app.js" + "start": "prisma migrate deploy && node app.js" }, "dependencies": { "@prisma/client": "^4.6.0",