Compare commits
No commits in common. "6eda77e84cba6ab91778c89cf2b4708dcb6dcb16" and "48995d2869c1e2b39444a202ffe3f764eddca65e" have entirely different histories.
6eda77e84c
...
48995d2869
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
|
|
@ -67,9 +67,7 @@ pipeline {
|
||||||
stage('🧭 Init - Détection environnement') {
|
stage('🧭 Init - Détection environnement') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
// Utiliser BRANCH_NAME (Multibranch Pipeline) ou GIT_BRANCH (fallback)
|
def currentBranch = sh(script: "git rev-parse --abbrev-ref HEAD", returnStdout: true).trim()
|
||||||
// git rev-parse --abbrev-ref HEAD retourne "HEAD" en detached HEAD mode
|
|
||||||
def currentBranch = env.BRANCH_NAME ?: env.GIT_BRANCH?.replaceAll('origin/', '') ?: sh(script: "git rev-parse --abbrev-ref HEAD", returnStdout: true).trim()
|
|
||||||
echo "🧭 Branche détectée : ${currentBranch}"
|
echo "🧭 Branche détectée : ${currentBranch}"
|
||||||
|
|
||||||
if (["dev", "preprod", "main"].contains(currentBranch)) {
|
if (["dev", "preprod", "main"].contains(currentBranch)) {
|
||||||
|
|
|
||||||
26
index.js
26
index.js
|
|
@ -7,6 +7,7 @@ import config from "./src/config/env.js";
|
||||||
import { pool } from "./db.js";
|
import { pool } from "./db.js";
|
||||||
import { errorHandler } from "./src/middleware/errorHandler.js";
|
import { errorHandler } from "./src/middleware/errorHandler.js";
|
||||||
import { metricsMiddleware } from "./src/middleware/metrics.js";
|
import { metricsMiddleware } from "./src/middleware/metrics.js";
|
||||||
|
import { initDatabase } from "./scripts/auto-init-db.js";
|
||||||
|
|
||||||
// Import routes
|
// Import routes
|
||||||
import authRoutes from "./src/routes/auth.routes.js";
|
import authRoutes from "./src/routes/auth.routes.js";
|
||||||
|
|
@ -25,19 +26,14 @@ app.use(
|
||||||
cors({
|
cors({
|
||||||
origin: function (origin, callback) {
|
origin: function (origin, callback) {
|
||||||
const allowedOrigins = [
|
const allowedOrigins = [
|
||||||
// Localhost
|
|
||||||
"http://localhost:3000",
|
"http://localhost:3000",
|
||||||
"http://localhost:3001",
|
"http://localhost:3001",
|
||||||
"http://localhost:3002",
|
"http://localhost:3002",
|
||||||
"http://localhost:3003",
|
"http://localhost:3003",
|
||||||
"http://localhost:3004",
|
"http://localhost:3004",
|
||||||
"http://localhost:3005",
|
"http://localhost:3005",
|
||||||
// Production
|
|
||||||
"https://dsp5-archi-o24a-15m-g3.fr",
|
"https://dsp5-archi-o24a-15m-g3.fr",
|
||||||
// Dev
|
"https://dev.dsp5-archi-o24a-15m-g3.fr"
|
||||||
"https://dev.dsp5-archi-o24a-15m-g3.fr",
|
|
||||||
// Preprod
|
|
||||||
"https://preprod.dsp5-archi-o24a-15m-g3.fr"
|
|
||||||
];
|
];
|
||||||
// Autoriser les requêtes sans origin (Postman, curl, etc.)
|
// Autoriser les requêtes sans origin (Postman, curl, etc.)
|
||||||
if (!origin) return callback(null, true);
|
if (!origin) return callback(null, true);
|
||||||
|
|
@ -112,7 +108,19 @@ export default app;
|
||||||
// Lancement serveur (seulement si pas importé par les tests)
|
// Lancement serveur (seulement si pas importé par les tests)
|
||||||
if (process.env.NODE_ENV !== 'test') {
|
if (process.env.NODE_ENV !== 'test') {
|
||||||
const PORT = config.server.port;
|
const PORT = config.server.port;
|
||||||
app.listen(PORT, "0.0.0.0", () => {
|
|
||||||
console.log(`🚀 Backend lancé sur 0.0.0.0:${PORT} ✅`);
|
// Initialiser la base de données avant de lancer le serveur
|
||||||
});
|
initDatabase()
|
||||||
|
.then(() => {
|
||||||
|
app.listen(PORT, "0.0.0.0", () => {
|
||||||
|
console.log(`🚀 Backend lancé sur 0.0.0.0:${PORT} ✅`);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error('❌ Erreur lors de l\'initialisation de la base de données:', error);
|
||||||
|
// Lancer le serveur quand même pour permettre le debug
|
||||||
|
app.listen(PORT, "0.0.0.0", () => {
|
||||||
|
console.log(`🚀 Backend lancé sur 0.0.0.0:${PORT} (sans init DB) ⚠️`);
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user