diff --git a/Dockerfile b/Dockerfile index 3d96cbc..a7bfe69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ COPY package.json . COPY yarn.lock . RUN yarn --production --frozen-lockfile COPY migrations ./migrations -COPY src/server.js ./ +COPY src ./src COPY knexfile.js ./ RUN mkdir db # @@ -14,4 +14,4 @@ WORKDIR /app COPY --from=0 /app /app ENV NODE_ENV production EXPOSE 3000 -ENTRYPOINT ["/bin/sh", "-c", "yarn migrate && node ./server.js"] \ No newline at end of file +ENTRYPOINT ["/bin/sh", "-c", "yarn migrate && node ./src/server.js"] \ No newline at end of file diff --git a/src/server.js b/src/server.js index 7c5d7f3..692eb7c 100644 --- a/src/server.js +++ b/src/server.js @@ -15,13 +15,9 @@ let config = { return `http://${config.domain}`; } } - -const knex = require('knex')({ - client: 'sqlite3', - connection: { - filename: "./dev.sqlite3" - } -}); +const environment = process.env.NODE_ENV || 'development'; +const knexConfiguration = require('../knexfile')[environment]; +const knex = require('knex')(knexConfiguration); const authenticate = { realm: 'Short' } fastify.register(require('fastify-basic-auth'), { validate, authenticate });