Merge branch 'master' of gitlab.binets.fr:br/sigma-backend

.gitlab-ci.yml

@@ -25,28 +25,23 @@ stages:
 # make migrations on and seed the db
 install-dependencies:
   stage: install
+  before_script: 
+    - npm i -g npm
   script:
-    - npm install -q
+    - npm ci
   artifacts:
     paths:
       - node_modules/
-  tags:
-    - build
 
 build:
   stage: build
   before_script:
+    - export NODE_ENV=staging
     - echo $LDAP_CONN_CONFIG > ldap_connexion_config.json
-  script:
-    - npm run build
-    - knex migrate:latest
-    - knex seed:run
+  script: npm run build
   artifacts:
     paths:
       - build/
-  tags:
-    - build
-    - database
 
 deploy-staging:
   stage: deploy
@@ -63,9 +58,10 @@ deploy-staging:
     - ssh -p22 sigma-dev@roued "rm -rf /opt/sigma-back-dev/assets"
     - scp -p22 -r build/ sigma-dev@roued:/opt/sigma-back-dev/build
     - scp -p22 -r assets/ sigma-dev@roued:/opt/sigma-back-dev/assets
+    - scp -p22 -r db/ sigma-dev@roued:/opt/sigma-back-dev/db
+    - scp -p22 knexfile.js sigma-dev@roued:/opt/sigma-back-dev/knexfile.js
+    - ssh -p22 sigma-dev@roued "cd /opt/sigma-back-dev && knex migrate:latest && knex seed:run"
     - scp -p22 package.json "package-lock.json" ldap_config.json ldap_connexion_config.json sigma-back-dev.service sigma-dev@roued:/opt/sigma-back-dev/
   environment:
     name: staging
     url: http://129.104.210.10:3000
-  tags:
-    - deployment

knexfile.js

@@ -30,10 +30,10 @@ module.exports = {
             directory: path.resolve('./db/seeds')
         }
     },
-    production: {
+    staging: {
         client: 'pg',
         connection: {
-            host: 'localhost',
+            host: '129.201.104.10',
             user: 'will',
             password: 'password',
             database: 'sigma_dev',