Merge branch 'master' into 'prepare_production'

# Conflicts: # config/config.js

Merge branch 'master' into 'prepare_production'
# Conflicts: # config/config.js
edc8354b · Wolfgang Knopki · 6da9a2ad · e0199f9d · edc8354b
Commit edc8354b authored 4 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 1 deletion
+13 -1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,4 +9,16 @@ pages-devel:
    - testing
  only: 
    - testing
    - test_logoutbutton
\ No newline at end of file
+pages-devel:    
+  stage: deploy
+  script:
+    - npm install
+    - "pm2 delete --silent account || :"
+    - pm2 start ./app.js --name=account
+    - pm2 save
+  tags: 
+    - production
+  only: 
+    - master
\ No newline at end of file