diff --git a/Jenkinsfile b/Jenkinsfile index 7d2957a1c..7cad5ef41 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,7 +54,6 @@ pipeline { } environment { PROJECT_NAME = 'lilium' - STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}" } stages { stage('Install') { @@ -104,15 +103,18 @@ pipeline { when { expression { PROTECTED_BRANCH } } - environment { - DOCKER_HOST = "${env.SWARM_HOST}" - } steps { script { def packageJson = readJSON file: 'package.json' env.VERSION = packageJson.version } - sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}" + withKubeConfig([ + serverUrl: "$KUBERNETES_API", + credentialsId: 'kubernetes', + namespace: 'lilium' + ]) { + sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION' + } } } } diff --git a/docker-compose.yml b/docker-compose.yml index 6494739f2..df793fc75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,7 @@ version: '3.7' services: main: - image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?} + image: registry.verdnatura.es/salix-frontend:${VERSION:?} build: context: . dockerfile: ./Dockerfile - ports: - - 4000 - deploy: - replicas: ${FRONT_REPLICAS:?} - placement: - constraints: - - node.role == worker - resources: - limits: - memory: 1G diff --git a/package.json b/package.json index 38a1d06a3..742fbf276 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.24.0", + "version": "24.24.1", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue index d05e9c40f..beaa85bfe 100644 --- a/src/components/ui/FetchedTags.vue +++ b/src/components/ui/FetchedTags.vue @@ -61,7 +61,7 @@ const tags = computed(() => { .inline-tag { height: 1rem; margin: 0.05rem; - color: $secondary; + color: $color-font-secondary; text-align: center; font-size: smaller; padding: 1px; diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue index f99f6f4d7..25491417d 100644 --- a/src/components/ui/QCalendarMonthWrapper.vue +++ b/src/components/ui/QCalendarMonthWrapper.vue @@ -147,7 +147,7 @@ const containerClasses = computed(() => { .q-calendar-month__head--workweek, .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis { text-transform: capitalize; - color: #777; + color: var(---color-font-secondary); font-weight: bold; font-size: 0.8rem; text-align: center; diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 899ae4397..da6cefb12 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%); $dark-shadow-color: black; $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d; $spacing-md: 16px; - +$color-font-secondary: #777; .bg-success { background-color: $positive; } diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 0e6edeab2..ef7fb0ae6 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -866,7 +866,7 @@ worker: sex: Sexo seniority: Antigüedad fi: DNI/NIE/NIF - birth: Cumpleaños + birth: Fecha de nacimiento isFreelance: Autónomo isSsDiscounted: Bonificación SS hasMachineryAuthorized: Autorizado para llevar maquinaria diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue index 5ed6af1a9..b98d755f3 100644 --- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue +++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue @@ -320,13 +320,13 @@ function exprBuilder(param, value) {