diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 844bfef..b3acb98 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -6,10 +6,13 @@ COPY package.json ./package.json COPY package-lock.json ./package-lock.json RUN npm i +RUN apt update && apt install -y postgresql-client RUN mkdir src +RUN mkdir translations COPY src src COPY scheme.psql . -COPY messages.json . +COPY cities.sql . +COPY translations translations CMD ["npm", "run" ,"start"] \ No newline at end of file diff --git a/src/db.js b/src/db.js index 60e2af9..ccb40c8 100644 --- a/src/db.js +++ b/src/db.js @@ -21,7 +21,7 @@ const getClient = async () => { await client.query("DELETE FROM cities"); //Not sure if pg has support for such kind of things, sooooooooo - exec(`psql -h ${process.env.POSTGRES_HOST} -p ${process.env.POSTGRES_PORT} -d ${process.env.POSTGRES_DB} -U ${process.env.POSTGRES_USER} -f ./cities.sql`, (error) => { + exec(`PGPASSWORD=${process.env.POSTGRES_PASSWORD} psql -h ${process.env.POSTGRES_HOST} -p ${process.env.POSTGRES_PORT} -d ${process.env.POSTGRES_DB} -U ${process.env.POSTGRES_USER} -f ./cities.sql`, (error) => { if (error) logError(error); }) }