Commit 9c432dc4 authored by Surya singh's avatar Surya singh Committed by surya singh
Browse files

Remove hardcoded mongo uri from typeOrm config

parent 9b04d989

.deploy/shop-web-angular/Dockerfile

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ USER node 
WORKDIR /srv/ever



COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./

COPY --chown=node:node packages/admin-web-angular/package.json ./packages/admin-web-angular/package.json

COPY --chown=node:node packages/shop-web-angular/package.json ./packages/shop-web-angular/package.json

COPY --chown=node:node .snyk ./.snyk

COPY --chown=node:node packages/common ./packages/common

COPY --chown=node:node packages/common-angular ./packages/common-angular
@@ -32,7 +32,7 @@ RUN npm install cross-env -g \ 
	&& chmod +x /wait



RUN mkdir /srv/ever && chown node:node /srv/ever

RUN mkdir -p /srv/ever/packages/admin-web-angular && chown node:node /srv/ever/packages/admin-web-angular

RUN mkdir -p /srv/ever/packages/shop-web-angular && chown node:node /srv/ever/packages/shop-web-angular

RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common

RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
@@ -47,11 +47,11 @@ ENV NODE_ENV production 
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules

COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules

COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules

COPY --from=development --chown=node:node /srv/ever/packages/admin-web-angular/node_modules ./packages/admin-web-angular/node_modules

COPY --from=development --chown=node:node /srv/ever/packages/shop-web-angular/node_modules ./packages/shop-web-angular/node_modules

COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./

COPY --chown=node:node packages/common ./packages/common

COPY --chown=node:node packages/common-angular ./packages/common-angular

COPY --chown=node:node packages/admin-web-angular ./packages/admin-web-angular

COPY --chown=node:node packages/shop-web-angular ./packages/shop-web-angular



EXPOSE 5500 5501 5050 5555

docker-compose.yml

+1 −20
Original line number Diff line number Diff line
@@ -15,26 +15,6 @@ services: 
        networks:

            - overlay



    admin-web:

        container_name: admin-web

        image: ever-admin-web:latest

        build:

            context: .

            dockerfile: .deploy/admin-web-angular/Dockerfile

        environment:

            NODE_ENV: production

        restart: on-failure

        depends_on:

            - core

        volumes:

            - .:/srv/ever

            - root_node_modules:/srv/ever/node_modules

            - admin_web_node_modules:/srv/ever/packages/admin-web/node_modules

        ports:

            - 4200:4200

        networks:

            - overlay



    core:

        container_name: core

        image: ever-core:latest
@@ -45,6 +25,7 @@ services: 
            NODE_ENV: production

            WAIT_HOSTS: mongo:27017

            DB_URI: mongodb://mongo/ever_development

            TESTING_DB_URI: mongodb://mongo/ever_testing

        restart: on-failure

        depends_on:

            - mongo

packages/core/src/app.module.ts

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ const entities = ServicesApp.getEntities(); 
		// configure TypeORM Connection which will be possible to use inside NestJS (e.g. resolvers)

		TypeOrmModule.forRoot({

			type: 'mongodb',

			host: 'localhost',

			database: 'test',

			url: env.DB_URI,

			entities,

			synchronize: true,

			useNewUrlParser: true,

.deploy/core/Dockerfile

+1 −1

File changed.

Contains only whitespace changes.