verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge branch 'dev' into 7937-claimAgile

This commit is contained in:
Javi Gallego 2025-02-18 09:19:02 +01:00
parent a30f12dd27 ca8bc43262
commit 0b7bcd9e33
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Jenkinsfile vendored
View File

@ -156,23 +156,23 @@ pipeline {
parallel {
stage('Back') {
steps {
dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
dockerBuild 'salix-back', '.', 'back/Dockerfile'
}
}
stage('Front') {
steps {
sh 'gulp build'
dockerBuildPush 'salix-front', 'front'
dockerBuild 'salix-front', 'front'
}
}
stage('DB') {
steps {
sh 'npx myt run -t'
sh 'docker exec vn-database sh -c "cp -r /var/lib/mysql /data"'
sh 'docker commit vn-database vn_db'
sh 'docker stop vn-database'
sh 'docker rm vn-database'
dockerBuildPush 'salix-db', 'db'
sh 'docker exec vn-database sh -c "rm -rf /mysql-template"'
sh 'docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"'
sh 'docker commit vn-database salix-db:$VERSION'
sh 'docker rm -f vn-database'
dockerPush docker.image("salix-db:${VERSION}")
}
}
}
@ -248,13 +248,16 @@ pipeline {
}
}
def dockerBuildPush(imageName, context, dockerfile = null) {
def dockerBuild(imageName, context, dockerfile = null) {
if (dockerfile == null)
dockerfile = "${context}/Dockerfile"
def baseImage = "${imageName}:${env.VERSION}"
def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
dockerPush(image)
}
def dockerPush(image) {
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
def baseImage = "${imageName}:${env.VERSION}"
def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
image.push()
image.push(env.BRANCH_NAME)
if (IS_LATEST) image.push('latest')

4
db/Dockerfile
View File

@ -1,4 +0,0 @@
FROM mariadb:10.11.6
ENV TZ Europe/Madrid
COPY --from=vn_db /data /var/lib/mysql
CMD ["mysqld"]

10
db/routines/vn/procedures/ticket_setState.sql
View File

@ -26,17 +26,17 @@ proc:BEGIN
JOIN ticketTracking tt ON tt.stateFk = s.id
JOIN ticket t ON t.id = tt.ticketFk
WHERE tt.ticketFk = vSelf
ORDER BY tt.created DESC
ORDER BY tt.created DESC, tt.id DESC
LIMIT 1;
SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
CALL util.throw('ASSIGN_ZONE_FIRST');
END IF;
SET vCanChangeState = ((
vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
vTicketAlertLevel < vPackedAlertLevel
) AND NOT (
vTicketStateCode IN ('CHECKED', 'CHECKING')
@ -52,8 +52,8 @@ proc:BEGIN
LEAVE proc;
END IF;
INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
SELECT id, vSelf, vNewWorkerFk
INSERT INTO ticketTracking (stateFk, ticketFk, userFk, created)
SELECT id, vSelf, vNewWorkerFk, util.VN_NOW()
FROM state
WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
ELSE