diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 265043a854cd6f986a412046a27e9273cf6440f6..2bc13e8f59226280fe8c00393c29da49a6fc4743 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,8 @@ pages-testing: stage: deploy script: - - npm install - - npm run clean - - npm run build - - rm -R built/views - - cp -R views built - - cat $configfiledev > ./built/config/config.js - - "pm2 delete --silent project || :" - - pm2 start ./built/app.js --name=project - - pm2 save + - echo "script" + - npm version tags: - testing only: @@ -26,4 +19,4 @@ pages-production: tags: - production only: - - master \ No newline at end of file + - master diff --git a/config/config.ts b/config/config.ts index 3d03f562faaacbbf1776bf507ec0e7bc8705e6a1..84635910e33d72d20795b7a3d6dcdfaa1b1c459f 100644 --- a/config/config.ts +++ b/config/config.ts @@ -5,6 +5,7 @@ module.exports = { port: process.env.PORT || 8888 }, database: { + host: 'localhost', user: 'usernamedb', // DB username password: 'passworddb', // DB password port: 3306, // MySQL port @@ -22,6 +23,7 @@ module.exports = { port: process.env.PORT || 8888 }, database: { + host: 'localhost', user: 'usernamedb', // DB username password: 'passworddb', // DB password port: 3306, // MySQL port diff --git a/package.json b/package.json index 66c67cf63b102d4cde36c6a99a87da339969d74a..69a759899511bac4827ded9839a87767d5942798 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ }, "scripts": { "start": "nodemon app.ts", - "build": "tsc --build", - "clean": "tsc --build --clean", + "build": "tsc -build", + "clean": "tsc -build --clean", "test": "" }, "dependencies": {