From 7160c52bf7360f25cbdeb5ab32f42fb9f0b736ea Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Wed, 16 Apr 2025 12:53:12 +0300 Subject: [PATCH] fix: Reverted original docker image building --- dev/build/Dockerfile | 3 +-- dev/build/config.yml | 2 -- docker-compose.yml | 9 ++++++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile index 565d1f17..fa95ac99 100644 --- a/dev/build/Dockerfile +++ b/dev/build/Dockerfile @@ -17,7 +17,6 @@ COPY ./.eslintrc.yml ./.eslintrc.yml RUN yarn cache clean RUN yarn --frozen-lockfile --non-interactive - RUN yarn build RUN rm -rf /wiki/node_modules RUN yarn --production --frozen-lockfile --non-interactive @@ -41,7 +40,7 @@ COPY --chown=node:node --from=assets /wiki/assets ./assets COPY --chown=node:node --from=assets /wiki/node_modules ./node_modules COPY --chown=node:node ./server ./server COPY --chown=node:node --from=assets /wiki/server/views ./server/views -COPY --chown=node:node ./config.yml ./config.yml +COPY --chown=node:node ./dev/build/config.yml ./config.yml COPY --chown=node:node ./package.json ./package.json COPY --chown=node:node ./LICENSE ./LICENSE diff --git a/dev/build/config.yml b/dev/build/config.yml index 833628fd..d9e58761 100644 --- a/dev/build/config.yml +++ b/dev/build/config.yml @@ -1,5 +1,3 @@ -# WARNING: This file is not using in docker build -# Instead of it will be used file "config.yml" from root folder (that file which ignored in ".gitignore") port: 3000 bindIP: 0.0.0.0 db: diff --git a/docker-compose.yml b/docker-compose.yml index b892c6fc..e9fdee0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,19 @@ services: app: container_name: wiki + restart: unless-stopped build: context: . dockerfile: ./dev/build/Dockerfile + environment: + DB_TYPE: postgres + DB_HOST: localhost + DB_PORT: 5432 + DB_USER: wiki + DB_PASS: wiki + DB_NAME: wiki ports: - "80:3000" - restart: unless-stopped networks: - wiki