diff --git a/.development.env b/.development.env index eb55857..716b4af 100644 --- a/.development.env +++ b/.development.env @@ -2,6 +2,6 @@ PORT=5000 POSTGRES_HOST=postgres POSTGRES_USER=postgres POSTGRES_DB=nest-course -POSTGRESS_PASSWORD=root -POSTGRESS_PORT=5432 +POSTGRES_PASSWORD=root +POSTGRES_PORT=5432 PRIVATE_KEY=secret_key_safasf diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f8da1ba..375f471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,4 @@ COPY package*.json ./ RUN npm install -COPY . . - -COPY ./dist ./dist - -CMD ["npm", "run", "start:dev"] +COPY . . \ No newline at end of file diff --git a/README.md b/README.md index a6e1733..4189232 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ в файле .development.env конфигурация для бд. Добавить свою. -#### npm run start:dev - Запуск - -## - -#### docker-compose up +```sh +npm install +``` +```sh +docker-compose up +``` diff --git a/src/app.module.ts b/src/app.module.ts index 1791239..e7acc31 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -26,9 +26,9 @@ import * as path from 'path'; SequelizeModule.forRoot({ dialect: 'postgres', host: process.env.POSTGRES_HOST, - port: Number(process.env.POSTGRESS_PORT), + port: Number(process.env.POSTGRES_PORT), username: process.env.POSTGRES_USER, - password: process.env.POSTGRESS_PASSWORD, + password: process.env.POSTGRES_PASSWORD, database: process.env.POSTGRES_DB, models: [User, Role, UserRoles, Post], autoLoadModels: true diff --git a/src/users/users.service.ts b/src/users/users.service.ts index e6bc04f..a5f2619 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -15,7 +15,7 @@ export class UsersService { async createUser(dto: CreateUserDto) { const user = await this.userRepository.create(dto); const role = await this.roleService.getRoleByValue("ADMIN") - await user.$set('roles', [role.id]) + await user.$set('roles', [role?.id]) user.roles = [role] return user; }