From 867dc50dd9b80d03e276aa4b17ad736936868466 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Mon, 12 Nov 2018 11:09:49 +0100
Subject: [PATCH] Leave only NODE_ENV var env in gitlab-ci, add endpoint
description
---
.gitlab-ci.yml | 12 ------------
docker-compose.yml | 6 +++---
src/email/email.controller.ts | 3 ++-
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f2c2f4..61b10ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,6 @@ build_development:
- master
script:
- export NODE_ENV=DEV
- - export SERVICE_EMAIL_PORT=3001
- - export RABBITMQ_STANDARD_PORT=5672
- - export RABBITMQ_INTERFACE_PORT=15672
- docker-compose --project-name service-email-dev build
deploy_development:
@@ -19,9 +16,6 @@ deploy_development:
- master
script:
- export NODE_ENV=DEV
- - export SERVICE_EMAIL_PORT=3001
- - export RABBITMQ_STANDARD_PORT=5672
- - export RABBITMQ_INTERFACE_PORT=15672
- docker-compose --project-name service-email-dev up -d
build_staging:
@@ -30,9 +24,6 @@ build_staging:
- staging
script:
- export NODE_ENV=REC
- - export SERVICE_EMAIL_PORT=3101
- - export RABBITMQ_STANDARD_PORT=5673
- - export RABBITMQ_INTERFACE_PORT=15673
- sed -i 's/DEV_/REC_/g' docker-compose.yml
- docker-compose --project-name service-email-rec build
@@ -42,8 +33,5 @@ deploy_staging:
- staging
script:
- export NODE_ENV=REC
- - export SERVICE_EMAIL_PORT=3101
- - export RABBITMQ_STANDARD_PORT=5673
- - export RABBITMQ_INTERFACE_PORT=15673
- sed -i 's/DEV_/REC_/g' docker-compose.yml
- docker-compose --project-name service-email-rec up -d
diff --git a/docker-compose.yml b/docker-compose.yml
index 973b148..634ed61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
build: .
container_name: service-email-${NODE_ENV}
ports:
- - ${SERVICE_EMAIL_PORT}:3000
+ - ${DEV_SERVICE_EMAIL_PORT}:3000
environment:
- ADMIN_EMAILS=${DEV_ADMIN_EMAILS}
- RABBITMQ_USER=${DEV_RABBITMQ_USER}
@@ -15,8 +15,8 @@ services:
image: 'rabbitmq:3-management-alpine'
container_name: rabbitmq-${NODE_ENV}
ports:
- - ${RABBITMQ_STANDARD_PORT}:5672 # standar port for communication
- - ${RABBITMQ_INTERFACE_PORT}:15672 # graphique interface
+ - ${DEV_RABBITMQ_STANDARD_PORT}:5672 # standar port for communication
+ - ${DEV_RABBITMQ_INTERFACE_PORT}:15672 # graphique interface
environment:
- RABBITMQ_DEFAULT_USER=${DEV_RABBITMQ_USER}
- RABBITMQ_DEFAULT_PASS=${DEV_RABBITMQ_PASSWORD}
diff --git a/src/email/email.controller.ts b/src/email/email.controller.ts
index c4bbdb8..6e081c6 100644
--- a/src/email/email.controller.ts
+++ b/src/email/email.controller.ts
@@ -1,7 +1,7 @@
import { Controller, Post, Body, Res } from '@nestjs/common';
import { ContactForm } from './email';
import { EmailService } from './email.service';
-import { ApiBadRequestResponse, ApiOkResponse, ApiUseTags } from '@nestjs/swagger';
+import { ApiBadRequestResponse, ApiOkResponse, ApiUseTags, ApiOperation } from '@nestjs/swagger';
@ApiUseTags('email')
@Controller('email')
@@ -12,6 +12,7 @@ export class EmailController {
) {}
@Post('contact')
+ @ApiOperation({ title: 'Send email to admin (emails defined as var env of the project, see docker-compose.yml file).' })
@ApiOkResponse({ description: 'OK'})
@ApiBadRequestResponse({ description: 'Missing fields'})
create(@Body() contactForm: ContactForm, @Res() res) {
--
GitLab