Skip to content

Commit 615a2e2

Browse files
committed
[#217] Add centos 7 / mariadb 10.6 project
Linked to #217 because all Centos 7 projects will be removed in the near future.
1 parent 13cb1a9 commit 615a2e2

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

irods_testing_environment/odbc_setup.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,18 @@ def configure_odbc_driver_rockylinux_9_mariadb_114(csp_container, odbc_driver):
757757
"""
758758
configure_odbc_driver_el_9_mariadb(csp_container, odbc_driver)
759759

760+
def configure_odbc_driver_centos_7_mariadb_106(csp_container, odbc_driver):
761+
"""Configure ODBC driver for mariadb 10.6 centos 7.
762+
763+
Argument:
764+
csp_container -- docker container on which the iRODS catalog service provider is running
765+
odbc_driver -- path to local archive file containing the ODBC driver package
766+
"""
767+
# This function assumes that irods/irods#7323 will not be resolved before the removal of all centos 7 projects.
768+
# Therefore, we will hard-code usage of the mysql 8.0 ODBC driver for the mariadb 10.6 project until this is
769+
# removed on resolution of #217.
770+
configure_odbc_driver_centos_7_mysql_80(csp_container, odbc_driver)
771+
760772
def configure_odbc_driver(platform_image, database_image, csp_container, odbc_driver=None):
761773
"""Make an ODBC setup strategy for the given database type.
762774
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: '3'
2+
3+
services:
4+
catalog:
5+
image: mariadb:10.6
6+
environment:
7+
- MARIADB_ROOT_PASSWORD=testpassword
8+
- MARIADB_USER=irods
9+
- MARIADB_PASSWORD=testpassword
10+
# For parity with mysql 8.0, we use utf8mb4 charset and utf8mb4_bin collation (for case sensitivity), and disable the binary log
11+
command: "--transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --disable-log-bin"
12+
13+
irods-catalog-provider:
14+
build:
15+
context: ..
16+
dockerfile: ${dockerfile}
17+
depends_on:
18+
- catalog
19+
volumes:
20+
- shared_volume:/irods_testing_environment_mount_dir
21+
22+
irods-catalog-consumer:
23+
build:
24+
context: ..
25+
dockerfile: ${dockerfile}
26+
depends_on:
27+
- irods-catalog-provider
28+
volumes:
29+
- shared_volume:/irods_testing_environment_mount_dir
30+
31+
# This volume is mounted on all test servers for detached mode testing which
32+
# requires a common vault.
33+
volumes:
34+
shared_volume:

0 commit comments

Comments
 (0)