diff --git a/unleash-server/sql/Gruntfile.js b/unleash-server/Gruntfile.js similarity index 60% rename from unleash-server/sql/Gruntfile.js rename to unleash-server/Gruntfile.js index 90a7eadf83..562cc0cb97 100644 --- a/unleash-server/sql/Gruntfile.js +++ b/unleash-server/Gruntfile.js @@ -1,4 +1,6 @@ -var dbPort = (process.env.BOXEN_POSTGRESQL_PORT || '5432'); +// TEMPORARY USE OF GRUNT FOR DB MIGRATIONS + +var dbUrl = process.env.DB_URL || 'postgresql://localhost:5432/unleash'; module.exports = function(grunt) { grunt.loadNpmTasks('grunt-liquibase'); @@ -6,10 +8,10 @@ module.exports = function(grunt) { grunt.initConfig({ liquibase : { options: { - username : '', - password : '', - url : 'jdbc:postgresql://localhost:' + dbPort + '/unleash', - changeLogFile: 'db_changes/db.changelog-master.xml' + username: '', + password: '', + url : 'jdbc:' + dbUrl, + changeLogFile: 'sql/db_changes/db.changelog-master.xml' }, update: { command: 'update' diff --git a/unleash-server/package.json b/unleash-server/package.json index b51fd0c849..5fb4076469 100644 --- a/unleash-server/package.json +++ b/unleash-server/package.json @@ -24,7 +24,7 @@ "test-bamboo-ci": "mocha test test/*", "db-create": "createdb unleash", "db-drop": "dropdb unleash", - "db-migrate": "cd sql && grunt liquibase:update" + "db-migrate": "grunt --verbose liquibase:update" }, "dependencies": { "bluebird": "2.2.2", @@ -36,7 +36,7 @@ "log4js": "0.6.21", "nconf": "0.6.9", "grunt": "^0.4.5", - "grunt-liquibase": "^0.1.5" + "grunt-liquibase": "finn-no/grunt-liquibase#auth-in-url" }, "devDependencies": { "chai": "1.9.1",