dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "v1.0.2 (#8)" (#9)

Browse Source 
This reverts commit b91bfa21b3.
This commit is contained in:
Andras Bacsai
2021-03-30 22:15:37 +02:00
committed by GitHub
parent 73d3d43215
commit a1cccd479e
18 changed files with 124 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/routes/v1/application/deploy/index.js
View File

@@ -60,10 +60,6 @@ module.exports = async function (fastify) {
foundDomain = true
}
if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
// Base service configuration changed
if (!running.build.container.baseSHA || running.build.container.baseSHA !== configuration.build.container.baseSHA) {
configChanged = true
}
const state = await execShellAsync(`docker stack ps ${running.build.container.name} --format '{{ json . }}'`)
const isError = state.split('\n').filter(n => n).map(s => JSON.parse(s)).filter(n => n.DesiredState !== 'Running')
if (isError.length > 0) forceUpdate = true

4
api/routes/v1/upgrade/index.js
View File

@@ -3,10 +3,10 @@ const { saveServerLog } = require('../../../libs/logging')
module.exports = async function (fastify) {
fastify.get('/', async (request, reply) => {
const upgradeP1 = await execShellAsync('bash ./upgrade.sh upgrade-p1')
const upgradeP1 = await execShellAsync('bash ./install.sh upgrade-phase-1')
await saveServerLog({ event: upgradeP1, type: 'UPGRADE-P-1' })
reply.code(200).send('I\'m trying, okay?')
const upgradeP2 = await execShellAsync('bash ./upgrade.sh upgrade-p2')
const upgradeP2 = await execShellAsync('bash ./install.sh upgrade-phase-2')
await saveServerLog({ event: upgradeP2, type: 'UPGRADE-P-2' })
})
}