From 7732250a37b8c1edc9af9509037aebf4f232f466 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Mon, 7 Dec 2020 18:08:14 +0100
Subject: [PATCH] fix(cicd): docker build issue
---
.gitlab-ci.yml | 35 +++++++++++++++++------------------
Dockerfile | 2 ++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15b807c2e..8b2d8975d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,21 +17,20 @@ build:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-
-code_analysis:
- image: skilldlabs/sonar-scanner:3.4.0
- services:
- - docker:18.09-dind
- stage: sonar-analysis
- only:
- - dev
- script:
- - >
- sonar-scanner
- -Dsonar.projectName=${SONAR_PROJECT_KEY}
- -Dsonar.projectVersion=1.0
- -Dsonar.sourceEncoding=UTF-8
- -Dsonar.projectBaseDir=.
- -Dsonar.host.url=${SONAR_URL}
- -Dsonar.projectKey=${SONAR_PROJECT_KEY}
- -Dsonar.login=${SONAR_TOKEN}
+# code_analysis:
+# image: skilldlabs/sonar-scanner:3.4.0
+# services:
+# - docker:18.09-dind
+# stage: sonar-analysis
+# only:
+# - dev
+# script:
+# - >
+# sonar-scanner
+# -Dsonar.projectName=${SONAR_PROJECT_KEY}
+# -Dsonar.projectVersion=1.0
+# -Dsonar.sourceEncoding=UTF-8
+# -Dsonar.projectBaseDir=.
+# -Dsonar.host.url=${SONAR_URL}
+# -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+# -Dsonar.login=${SONAR_TOKEN}
diff --git a/Dockerfile b/Dockerfile
index 4be220d9b..0ca837237 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,8 @@ RUN npm install
# Bundle app source
COPY . .
+RUN npm build
+
CMD ["sh","-c", "npm run start:prod"]
EXPOSE 3000
--
GitLab