Skip to content
Snippets Groups Projects
Commit 3136d71d authored by Jérôme POIRIER's avatar Jérôme POIRIER
Browse files

Merge branch 'release' into 'master' 

Release

See merge request !15
parents deeecd59 275430b1
Branches master
No related tags found
1 merge request!15Release
Pipeline #106578 waiting for manual action
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 45
− 46
View file @ 3136d71d
......@@ -12,7 +12,7 @@ stages:
build-back:
stage: build
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.11.1-alpine
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:22.1-alpine
script:
- cd back
- npm i
......@@ -21,10 +21,11 @@ build-back:
paths:
- ./back/node_modules
expire_in: 1h
only:
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "release" && $CI_PIPELINE_SOURCE != "merge_request_event"
changes:
- .gitlab-ci.yml
- back/**/*
# *********************************************************************************************
# * TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST *
......@@ -33,7 +34,7 @@ build-back:
test-back:
stage: test
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.11.1-alpine
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:22.1-alpine
script:
- cd back
- npm run test:cov
......@@ -41,10 +42,11 @@ test-back:
paths:
- ./back/coverage/lcov.info
expire_in: 5 mins
only:
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "release" && $CI_PIPELINE_SOURCE != "merge_request_event"
changes:
- .gitlab-ci.yml
- back/**/*
# *********************************************************************************************
# * SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR *
......@@ -62,7 +64,7 @@ sonarqube-back:
- npm install --save sonar-scanner
image:
name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
entrypoint: [""]
entrypoint: ['']
variables:
SONAR_URL: http://sonarqube.forge.grandlyon.com:9000
GIT_STRATEGY: clone
......@@ -92,7 +94,7 @@ default:
alias: docker
variables:
DOCKER_TLS_CERTDIR: ""
DOCKER_TLS_CERTDIR: ''
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
DEPENDENCY_PROXY: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/
......@@ -102,12 +104,11 @@ variables:
docker-backend-master:
stage: docker
only:
refs:
- master
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -121,12 +122,11 @@ docker-backend-master:
docker-backend-release:
stage: docker
only:
refs:
- release
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "release"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -140,12 +140,11 @@ docker-backend-release:
docker-backend-develop:
stage: docker
only:
refs:
- develop
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "develop"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -203,13 +202,13 @@ deploy-master:
inherit:
default: false
variables: false
only:
- master
when: manual
rules:
- if: $CI_COMMIT_BRANCH == "master"
when: manual
variables:
NAMESPACE_ENV: "p01"
NAMESPACE_ENV: 'p01'
REPLICA_ENV: 1
IMG_TAG: "stable"
IMG_TAG: 'stable'
FS_GROUP: 100084
before_script:
- *replacement_scripts
......@@ -230,13 +229,13 @@ deploy-rec:
inherit:
default: false
variables: false
only:
- release
when: manual
rules:
- if: $CI_COMMIT_BRANCH == "release"
when: manual
variables:
NAMESPACE_ENV: "r01"
NAMESPACE_ENV: 'r01'
REPLICA_ENV: 1
IMG_TAG: "rc"
IMG_TAG: 'rc'
FS_GROUP: 100082
before_script:
- *replacement_scripts
......@@ -257,12 +256,12 @@ deploy-develop:
inherit:
default: false
variables: false
only:
- develop
rules:
- if: $CI_COMMIT_BRANCH == "develop"
variables:
NAMESPACE_ENV: "d01"
NAMESPACE_ENV: 'd01'
REPLICA_ENV: 1
IMG_TAG: "latest"
IMG_TAG: 'latest'
FS_GROUP: 100083
before_script:
- *replacement_scripts
......@@ -288,9 +287,9 @@ deploy-mr:
when: manual
allow_failure: true
variables:
NAMESPACE_ENV: "d01"
NAMESPACE_ENV: 'd01'
REPLICA_ENV: 1
IMG_TAG: "MR"
IMG_TAG: 'MR'
FS_GROUP: 100083
before_script:
- *replacement_scripts
......
back/Dockerfile
+ 2
− 2
View file @ 3136d71d
......@@ -4,7 +4,7 @@
# *********************************************************************************************
ARG DEPENDENCY_PROXY=
FROM ${DEPENDENCY_PROXY}node:16.11.1-alpine AS builder
FROM ${DEPENDENCY_PROXY}node:22.1-alpine AS builder
WORKDIR /app
......@@ -22,7 +22,7 @@ RUN npm install \
# *********************************************************************************************
ARG DEPENDENCY_PROXY=
FROM ${DEPENDENCY_PROXY}node:16.11.1-alpine
FROM ${DEPENDENCY_PROXY}node:22.1-alpine
# Sets timezone
RUN apk add --no-cache tzdata
......
back/package-lock.json
+ 1959
− 3088
View file @ 3136d71d
Source diff could not be displayed: it is too large. Options to address this: view the blob.
back/package.json
+ 58
− 65
View file @ 3136d71d
......@@ -19,76 +19,69 @@
"test:debug": "node --expose-gc --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand --logHeapUsage"
},
"dependencies": {
"@nestjs/axios": "^3.0.0",
"@nestjs/common": "10.1.0",
"@nestjs/core": "10.1.0",
"@nestjs/microservices": "10.1.0",
"@nestjs/passport": "^10.0.0",
"@nestjs/platform-express": "10.1.0",
"@nestjs/swagger": "7.1.1",
"@nestjs/terminus": "10.0.1",
"@types/multer": "^1.4.7",
"axios": "^1.4.0",
"class-transformer": "0.5.1",
"class-validator": "0.14.0",
"dotenv": "^16.3.1",
"express-rate-limit": "6.7.1",
"form-data": "4.0.0",
"fs-extra": "11.1.1",
"helmet": "7.0.0",
"@nestjs/axios": "^3.0.2",
"@nestjs/common": "^10.3.8",
"@nestjs/core": "^10.3.8",
"@nestjs/microservices": "^10.3.8",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.3.8",
"@nestjs/swagger": "^7.3.1",
"@nestjs/terminus": "^10.2.3",
"@types/multer": "^1.4.11",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"dotenv": "^16.4.5",
"express-rate-limit": "^7.2.0",
"form-data": "^4.0.0",
"fs-extra": "^11.2.0",
"helmet": "^7.1.0",
"iconv-lite": "^0.6.3",
"joi": "17.9.2",
"passport": "^0.4.0",
"joi": "^17.13.1",
"passport": "^0.7.0",
"passport-headerapikey": "^1.2.2",
"rxjs": "7.8.1",
"swagger-ui-express": "5.0.0",
"winston": "^3.10.0",
"winston-daily-rotate-file": "^4.7.1"
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.0",
"winston": "^3.13.0",
"winston-daily-rotate-file": "^5.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.1.9",
"@nestjs/testing": "10.1.0",
"@types/bcrypt": "5.0.0",
"@types/bull": "3.15.9",
"@types/cookie-parser": "1.4.3",
"@types/cron": "2.0.1",
"@types/crypto-js": "4.1.1",
"@types/csurf": "1.11.2",
"@types/dotenv": "8.2.0",
"@types/express": "4.17.17",
"@types/express-rate-limit": "5.1.3",
"@types/express-serve-static-core": "4.17.35",
"@types/fs-extra": "11.0.1",
"@types/jest": "29.5.3",
"@types/mustache": "4.2.2",
"@types/node": "20.4.2",
"@types/nodemailer": "6.4.8",
"@types/passport": "^1.0.12",
"@types/passport-http": "^0.3.9",
"@types/passport-jwt": "3.0.9",
"@types/passport-local": "1.0.35",
"@types/puppeteer": "5.4.7",
"@types/qs": "6.9.7",
"@types/serve-static": "1.15.2",
"@types/supertest": "2.0.12",
"@types/uuid": "9.0.2",
"@types/validator": "13.7.17",
"cli-highlight": "2.1.11",
"concurrently": "8.2.0",
"highlight.js": "11.8.0",
"husky": "8.0.3",
"jest": "29.6.1",
"pretty-quick": "3.1.3",
"reflect-metadata": "0.1.13",
"supertest": "6.3.3",
"ts-jest": "29.1.1",
"ts-mockito": "2.6.1",
"@nestjs/cli": "^10.2.1",
"@nestjs/testing": "^10.2.10",
"@types/bcrypt": "^5.0.2",
"@types/cookie-parser": "^1.4.6",
"@types/crypto-js": "^4.2.1",
"@types/csurf": "^1.11.5",
"@types/dotenv": "^8.2.0",
"@types/express": "^4.17.21",
"@types/express-serve-static-core": "^4.17.41",
"@types/fs-extra": "^11.0.4",
"@types/jest": "^29.5.10",
"@types/mustache": "^4.2.5",
"@types/node": "^20.10.1",
"@types/nodemailer": "^6.4.14",
"@types/passport": "^1.0.16",
"@types/passport-http": "^0.3.11",
"@types/passport-jwt": "^3.0.13",
"@types/passport-local": "^1.0.38",
"@types/qs": "^6.9.10",
"@types/serve-static": "^1.15.5",
"@types/supertest": "^2.0.16",
"@types/uuid": "^9.0.7",
"@types/validator": "^13.11.7",
"cli-highlight": "^2.1.11",
"concurrently": "^8.2.2",
"highlight.js": "^11.9.0",
"husky": "^8.0.3",
"jest": "^29.7.0",
"pretty-quick": "^3.1.3",
"reflect-metadata": "^0.1.13",
"supertest": "^6.3.3",
"ts-jest": "^29.1.1",
"ts-mockito": "^2.6.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "4.2.0",
"tslint": "6.1.3",
"tslint-config-prettier": "1.18.0",
"tslint-plugin-prettier": "2.3.0",
"typescript": "5.1.6"
"tsconfig-paths": "^4.2.0",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
},
"jest": {
"moduleFileExtensions": [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment