diff --git a/Dockerfile b/Dockerfile index 963556b..5938c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,5 @@ ARG APP_PORT ENV APP_PORT $APP_PORT COPY . . RUN npm i - EXPOSE $APP_PORT -ENTRYPOINT ["node", "./src/index.js"] \ No newline at end of file +ENTRYPOINT ["bash", "./entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 7a90a6a..66af735 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: volumes: - ./data/uploads:${DATA_DIR} database: + hostname: database image: 'postgres:15' volumes: - ./data/db:/var/lib/postgresql/data @@ -21,4 +22,4 @@ services: POSTGRES_PASSWORD: ${DBPASS} POSTGRES_DB: ${DBNAME} healthcheck: - test: ["CMD", "pg_isready", "-U", "${DBUSER}"] \ No newline at end of file + test: ["CMD", "pg_isready", "-U", "${DBUSER}"] diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..894f8b9 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +npm run migrate up +node src/index.js diff --git a/patch b/patch new file mode 100644 index 0000000..ee3128d --- /dev/null +++ b/patch @@ -0,0 +1,32 @@ +diff --git a/Dockerfile b/Dockerfile +index 963556b..5938c34 100644 +--- a/Dockerfile ++++ b/Dockerfile +@@ -3,6 +3,5 @@ ARG APP_PORT + ENV APP_PORT $APP_PORT + COPY . . + RUN npm i +- + EXPOSE $APP_PORT +-ENTRYPOINT ["node", "./src/index.js"] +\ No newline at end of file ++ENTRYPOINT ["bash", "./entrypoint.sh"] +diff --git a/docker-compose.yml b/docker-compose.yml +index 7a90a6a..66af735 100644 +--- a/docker-compose.yml ++++ b/docker-compose.yml +@@ -10,6 +10,7 @@ services: + volumes: + - ./data/uploads:${DATA_DIR} + database: ++ hostname: database + image: 'postgres:15' + volumes: + - ./data/db:/var/lib/postgresql/data +@@ -21,4 +22,4 @@ services: + POSTGRES_PASSWORD: ${DBPASS} + POSTGRES_DB: ${DBNAME} + healthcheck: +- test: ["CMD", "pg_isready", "-U", "${DBUSER}"] +\ No newline at end of file ++ test: ["CMD", "pg_isready", "-U", "${DBUSER}"]