verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

5701-update_to_mariadb10.7.7 #1581

Merged
alexm merged 7 commits from 5701-update_to_mariadb10.7.7 into dev 2023-06-12 08:43:57 +00:00
Conversation 0 Commits 7 Files Changed 5 +17 -29
alexm commented 2023-05-31 13:00:59 +00:00
Member
Copy Link
No description provided.
alexm added 2 commits 2023-05-31 13:00:59 +00:00
gitea/salix/pipeline/head This commit looks good Details
0263d76021 refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good Details
4f3b6c3035 typo
alexm reviewed 2023-05-31 13:02:10 +00:00
db/docker/docker-temp-stop.sh Outdated
@ -4,4 +4,3 @@
CMD=mysqld
docker_setup_env "$CMD"
docker_temp_server_stop
alexm commented 2023-05-31 13:02:10 +00:00
Author
Member
Copy Link

Han passat de:

docker_temp_server_stop() {
	if ! MYSQL_PWD=$MARIADB_ROOT_PASSWORD mariadb-admin shutdown -uroot --socket="${SOCKET}"; then
		mysql_error "Unable to shut down server."
	fi
}

a

docker_temp_server_stop() {
	kill "$MARIADB_PID"
	wait "$MARIADB_PID"
}

https://github.com/MariaDB/mariadb-docker/blob/master/docker-entrypoint.sh
Ho he llevat pq sense funciona, pero supose que no es pot llevar aixina com aixina

Han passat de: ``` docker_temp_server_stop() { if ! MYSQL_PWD=$MARIADB_ROOT_PASSWORD mariadb-admin shutdown -uroot --socket="${SOCKET}"; then mysql_error "Unable to shut down server." fi } ``` a ``` docker_temp_server_stop() { kill "$MARIADB_PID" wait "$MARIADB_PID" } ``` https://github.com/MariaDB/mariadb-docker/blob/master/docker-entrypoint.sh Ho he llevat pq sense funciona, pero supose que no es pot llevar aixina com aixina
alexm requested review from juan 2023-05-31 13:02:58 +00:00
juan approved these changes 2023-06-06 19:18:43 +00:00
alexm added 131 commits 2023-06-09 12:38:58 +00:00
gitea/salix/pipeline/head This commit looks good Details
61d41fb687 refs #5507
gitea/salix/pipeline/head This commit looks good Details
8ae5a0de0f refs #5513 adding backs and models
gitea/salix/pipeline/head This commit looks good Details
5cdec35ed4 refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good Details
d21b949ffb refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
372b9a2ce2 refs #5513 test getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
f72c162ca7 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
9760e50212 refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good Details
62d0af25d3 refs #5642 uncommented tests
gitea/salix/pipeline/head There was a failure building this commit Details
ca9d76db77 refs #5137 moved sql
gitea/salix/pipeline/head This commit looks good Details
37b2920157 refs #5513 moved sql
gitea/salix/pipeline/head This commit looks good Details
9a5511f083 REFACTOR(node_version)! update to v20
gitea/salix/pipeline/head This commit looks good Details
f0b3177e21 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head There was a failure building this commit Details
2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head This commit looks good Details
a1bd051112 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
03e2b98485 hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good Details
43538a8e36 Merge pull request 'hotFix(closeAll): fix where' (!1557) from hotFix_fix_closeAll into master 
Reviewed-on: #1557
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
02c331ddd6 refs # fix(SQL): wagon
gitea/salix/pipeline/head This commit looks good Details
a052c363fa Merge pull request '232001_test_to_master' (!1559) from 232001_test_to_master into master 
Reviewed-on: #1559
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
33928aa406 refs #5730 correct folder
gitea/salix/pipeline/head This commit looks good Details
310536120e Merge pull request '232201_dev_to_test' (!1561) from 232201_dev_to_test into test 
Reviewed-on: #1561
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
a7363ce2a4 refs #5507 added service
gitea/salix/pipeline/head There was a failure building this commit Details
dfac44a87b hotfix 3rd parameter to null
gitea/salix/pipeline/head There was a failure building this commit Details
dd83b25bb2 Merge branch 'master' into hotfix-item_getBalance
gitea/salix/pipeline/head This commit looks good Details
7e5fcc73ad modified fixed structure
gitea/salix/pipeline/head This commit looks good Details
96feb24f12 refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
375fdf2a21 fix item_getBalance
gitea/salix/pipeline/head This commit looks good Details
71d8a355bd refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2e0721b101 refs #5667 Fixes: Id filter, translations
gitea/salix/pipeline/head This commit looks good Details
27d4d10472 refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good Details
b9cb812e0d Merge pull request 'fix item_getBalance' (!1569) from master_to_test2 into test 
Reviewed-on: #1569
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
be06a65a45 refs #5507 fixed e2e
gitea/salix/pipeline/head This commit looks good Details
3ecfbe2052 refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
527116f1ec refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
aca6e11983 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
a232e9ecea refs #5153
gitea/salix/pipeline/head This commit looks good Details
1ed8000be9 refs #5642 e2es refactored
gitea/salix/pipeline/head There was a failure building this commit Details
059467a383 refs #5137 sql moved to template
gitea/salix/pipeline/head Build queued... Details
1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
ba850415be refs #5137 moved sql
gitea/salix/pipeline/head This commit looks good Details
382bc06075 refs #5153
gitea/salix/pipeline/head There was a failure building this commit Details
32bdaa640e Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
30816f7947 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head There was a failure building this commit Details
576a5f050e refs #5513 fix back test
gitea/salix/pipeline/head This commit looks good Details
a4d7988591 refs #5517 Translations fixes
gitea/salix/pipeline/head This commit looks good Details
38823f8481 Merge pull request 'refs #5153 client descriptor business type' (!1573) from 5153---business-type-worker-descriptor into master 
Reviewed-on: #1573
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
23c52cc9b5 Merge pull request '5752-master_to_test' (!1578) from 5752-master_to_test into test 
Reviewed-on: #1578
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
d02ee2fd12 deploy(232201)
gitea/salix/pipeline/head This commit looks good Details
de91e016e9 update changelLg
gitea/salix/pipeline/head This commit looks good Details
0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
fb330cdbfa Merge pull request '232201_test_to_master' (!1582) from 232201_test_to_master into master 
Reviewed-on: #1582
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ffba5b2d7e Merge pull request 'refs #5398 fix' (!1579) from 5398-fixAgenciesWarehouses into dev 
Reviewed-on: #1579
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
69bf26433d fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good Details
8d0ae30610 Merge pull request 'fix(workerLog): acl to hr' (!1584) from fix_workerLog_acl into master 
Reviewed-on: #1584
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
a26ab80e88 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
5b0a1d10bb refs #5684 edi/updateData fix
gitea/salix/pipeline/head This commit looks good Details
cefe8e3e17 Merge pull request 'REFACTOR(node_version)! update to v20' (!1553) from salix-node20 into dev 
Reviewed-on: #1553
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
20e574aef4 Merge pull request 'refs #5684 edi/updateData fix' (!1585) from 5684-ediUpdateData into master 
Reviewed-on: #1585
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
95715763a1 refs #5667 Worker translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
c05d6bb9a1 refs #5563 WorkerDocument translation fixes
gitea/salix/pipeline/head This commit looks good Details
01175a4c6c quitado vn
gitea/salix/pipeline/head This commit looks good Details
1408e5f5ad Merge pull request 'hotfix_sendMail' (!1587) from hotfix_sendMail into master 
Reviewed-on: #1587
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5be79bbdef refs #5667 VnUser translations added
gitea/salix/pipeline/head This commit looks good Details
45eba4533a refs #5667 VnUser translation added
gitea/salix/pipeline/head This commit looks good Details
47c6ad6a71 refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good Details
fe32a2af05 refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head There was a failure building this commit Details
15b5f10a93 refs #5513 addFromBuy back added
gitea/salix/pipeline/head This commit looks good Details
9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
36b0216640 refs #5513 changed tests description
gitea/salix/pipeline/head There was a failure building this commit Details
a477bb32ad Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1504) from 5513-backs-embalajes into dev 
Reviewed-on: #1504
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6ef7055bc9 refs #5563 Display show values in logs
gitea/salix/pipeline/head This commit looks good Details
05111c9268 hotfix test front
gitea/salix/pipeline/head This commit looks good Details
ab66ffa64a Merge branch 'master' into hotfixTicketColors
gitea/salix/pipeline/head This commit looks good Details
47fe77efde Merge pull request 'master' (!1592) from master into test 
Reviewed-on: #1592
gitea/salix/pipeline/head This commit looks good Details
4ae6b7c739 Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master 
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
bda1ed41ae refs #5507 vnConfig moved to core
gitea/salix/pipeline/head There was a failure building this commit Details
7311e79273 fix(vn-model): rewriteMethod
gitea/salix/pipeline/head There was a failure building this commit Details
fd1e6122e8 Merge branch 'dev' into 5507-loadConfigAtStart
gitea/salix/pipeline/head This commit looks good Details
16ad082967 back fixed
gitea/salix/pipeline/head This commit looks good Details
3805812aba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
92a8e5f689 Merge pull request 'fix addFromBuy backTest' (!1593) from fix-addFromBuy-backTest into dev 
Reviewed-on: #1593
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b036b1f7df Merge branch 'dev' into 5507-loadConfigAtStart
gitea/salix/pipeline/head This commit looks good Details
46a3faea51 Merge pull request 'fixes #5507 this.vnConfig no tiene datos cargados al inicio de la aplicación' (!1565) from 5507-loadConfigAtStart into dev 
Reviewed-on: #1565
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
bfd421c188 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
b14a8d9fec Merge pull request 'fixes #5137 Avisos impresoras cuando hayan seleccionado una que no es principal' (!1514) from 5137-aviso-impresora into dev 
Reviewed-on: #1514
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
0bc4570706 Merge pull request 'fixes #5642 Arreglar e2e ticket Advance y ticket Future' (!1525) from 5642-arreglar-e2e-ticketFuture-ticketAdvance into dev 
Reviewed-on: #1525
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
bd4eee6606 refs #5252 eliminado warehouseFk = 1 por defecto #5252
gitea/salix/pipeline/head This commit looks good Details
2b70bfb3c2 Merge pull request 'master' (!1595) from master into test 
Reviewed-on: #1595
gitea/salix/pipeline/head This commit looks good Details
980ea67c24 Merge pull request 'test' (!1596) from test into dev 
Reviewed-on: #1596
gitea/salix/pipeline/head This commit looks good Details
8b92b35e29 Merge pull request '5252-canRefund_withOutWarehouse2' (!1567) from 5252-canRefund_withOutWarehouse2 into dev 
Reviewed-on: #1567
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5ba8a15316 refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good Details
dd72ac9107 refs #5809 version 232601 init
gitea/salix/pipeline/head This commit looks good Details
9c007504ea refs #5667 UI improved, filter by record
gitea/salix/pipeline/head There was a failure building this commit Details
d083ba795d Merge pull request 'refs #5667 UI improved, filter by record' (!1600) from test into dev 
Reviewed-on: #1600
gitea/salix/pipeline/head There was a failure building this commit Details
fdb9d2ed7f refs #5701 fix dockerFile and sh's
alexm added 2 commits 2023-06-12 05:33:54 +00:00
gitea/salix/pipeline/head This commit looks good Details
33f2d556fd refs #5701 fix(db/dockerFile): fix docker-temp-stop
alexm changed title from WIP: 5701-update_to_mariadb10.7.7 to 5701-update_to_mariadb10.7.7 2023-06-12 05:35:34 +00:00
alexm requested review from juan 2023-06-12 05:35:42 +00:00
juan approved these changes 2023-06-12 07:39:42 +00:00
alexm added 1 commit 2023-06-12 08:09:06 +00:00
gitea/salix/pipeline/head This commit looks good Details
473dc0e48b Merge branch 'dev' into 5701-update_to_mariadb10.7.7
alexm merged commit bbdc0d3e7f into dev 2023-06-12 08:43:57 +00:00
alexm deleted branch 5701-update_to_mariadb10.7.7 2023-06-12 08:43:57 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1581
No description provided.
Delete Branch "5701-update_to_mariadb10.7.7"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?