Merge remote-tracking branch 'origin/main'

.woodpecker/deploy-pipeline.yml

@@ -7,14 +7,14 @@ variables:
   appleboy_drone_scp: &appleboy_drone_scp appleboy/drone-scp
   appleboy_drone_ssh: &appleboy_drone_ssh appleboy/drone-ssh
   curlimages_curl: &curlimages_curl curlimages/curl:latest
-  NEXUS_URL: https://nexus.cicd.exygen.fr/repository/domaine-passignat/apps
+  nexus_url: &nexus_url http://nexus.cicd.exygen.fr/repository/domaine-passignat/apps
 
 
 steps:
   - name: get-share-data
     image: *minio_mc
     commands:
-      - echo "ℹ️ Save pipeline info"
+      - echo "ℹ️ Load pipeline info"
       - mc alias set local http://minio:9000 minioadmin minioadmin123
       - mc get local/cicd/repository_$CI_REPO_REMOTE_ID/pipeline_$CI_PIPELINE_PARENT .buildinfo
       - ls -als
@@ -22,13 +22,17 @@ steps:
 
   - name: get-artifact
     image: *curlimages_curl
-    commands: |
+    environment:
+      NEXUS_USERNAME:
+        from_secret: nexus_username
+      NEXUS_PASSWORD:
+        from_secret: nexus_password
+      NEXUS_REPOSITORY: domaine-passignat
+      NEXUS_URL: *nexus_url
+    commands:
       - ls -als
-      - more .buildinfo
-      - source .buildinfo
-      - echo new version: ${NEW_VERSION}
-      - curl -o /tmp/${CI_REPO_NAME}-${NEW_VERSION}.tar "$NEXUS_URL/${CI_REPO_NAME}/${NEW_VERSION}/${CI_REPO_NAME}-${VERSION}.tar"
-    depends_on: [ get-share-data]
+      - curl -o /tmp/${CI_REPO_NAME}-${NEW_VERSION}.tar "${NEXUS_URL}/${CI_REPO_NAME}/${NEW_VERSION}/${CI_REPO_NAME}-${NEW_VERSION}.tar"
+    depends_on: [ get-share-data ]
 
   # Étape 7: Transfert vers le serveur distant (SCP)
   - name: transfert
@@ -62,19 +66,20 @@ steps:
       envs:
         - SUDO_PASSWORD
       script:
+        - source .buildinfo
         - echo "$${SUDO_PASSWORD}" | sudo -S systemctl stop gestion
         - mkdir -p /srv/volumes/gestion/{front-binaries,back-binaries,tmpdb}
         - rm -rf /srv/volumes/gestion/front-binaries/*
         - rm -rf /srv/volumes/gestion/back-binaries/*
         - rm -rf /srv/volumes/gestion/tmpdb/*
-        - tar -xvf /tmp/${CI_REPO_NAME}-${VERSION}.tar -C /tmp
+        - tar -xvf /tmp/${CI_REPO_NAME}-${NEW_VERSION}.tar -C /tmp
         - tar -xvf /tmp/front.tar.gz -C /srv/volumes/gestion/front-binaries
         - tar -xzvf /tmp/back.tar.gz -C /srv/volumes/gestion/back-binaries
         - tar -xzvf /tmp/db.tar.gz -C /srv/volumes/gestion/tmpdb
         - rm -f /tmp/front.tar.gz
         - rm -f /tmp/back.tar.gz
         - rm -f /tmp/db.tar.gz
-        - rm -f /tmp/${CI_REPO_NAME}-${VERSION}.tar
+        - rm -f /tmp/${CI_REPO_NAME}-${NEW_VERSION}.tar
         - docker-compose up database
         - cd /srv/volumes/gestion/tmpdb
         - npm ci --cache .npm --prefer-offline

database/src/sql/version-0.0.44-0.0.45.sql

@@ -0,0 +1 @@
+-- none

database/src/sql/version-0.0.45-0.0.46.sql

@@ -0,0 +1 @@
+-- none

database/src/sql/version-0.0.46-0.0.47.sql

@@ -0,0 +1 @@
+-- none

database/src/sql/version-0.0.47-0.0.48.sql

@@ -0,0 +1 @@
+-- none

database/src/sql/version-0.0.48-0.0.49.sql

@@ -0,0 +1 @@
+-- none

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cicd",
 	"private": true,
-	"version": "0.0.44",
+	"version": "0.0.49",
 	"description": "Node.js Rest Apis with Express, Sequelize & PostgreSQL",
 	"scripts": {
 		"update:patch": "node scripts/update-version.js -patch",