From b302187900f95efe0ad9230db4eccbbf1fc5cae5 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Mon, 21 Aug 2023 22:26:47 +0000 Subject: [PATCH 1/2] Update SS submodule --- hack/submodules/archivematica-storage-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/submodules/archivematica-storage-service b/hack/submodules/archivematica-storage-service index 048b6f8790..b38f5bee7a 160000 --- a/hack/submodules/archivematica-storage-service +++ b/hack/submodules/archivematica-storage-service @@ -1 +1 @@ -Subproject commit 048b6f8790a0490568a890ee93e2e3b624b52ce8 +Subproject commit b38f5bee7afc7001c32bc2e770742e6825c02a18 From ad4e41bce2fe09882ecaa186f5b2a4d51b426501 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Mon, 21 Aug 2023 22:35:20 +0000 Subject: [PATCH 2/2] Upgrade MySQL --- hack/Makefile | 2 +- hack/docker-compose.yml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hack/Makefile b/hack/Makefile index db62a2017e..efbfdee61d 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -56,7 +56,7 @@ endef define grant_all_on_db docker compose exec -T mysql mysql -hlocalhost -uroot -p12345 -e '\ - GRANT ALL ON `$(1)`.* TO "archivematica"@"%" IDENTIFIED BY "demo";' + GRANT ALL ON `$(1)`.* TO "archivematica"@"%";' endef define drop_db diff --git a/hack/docker-compose.yml b/hack/docker-compose.yml index 9bb1baeaa8..cdf7d90ca3 100644 --- a/hack/docker-compose.yml +++ b/hack/docker-compose.yml @@ -27,9 +27,8 @@ volumes: services: mysql: - image: "percona:5.7" - user: "mysql" - command: "--character-set-server=utf8 --collation-server=utf8_general_ci" + image: "percona:8.0" + command: "--character-set-server=utf8mb4 --collation-server=utf8mb4_0900_ai_ci" environment: MYSQL_ROOT_PASSWORD: "12345" # These are used in the settings.testmysql modules