Skip to content

Commit 2ff6ac6

Browse files
authored
Merge pull request #153 from movabletype/oracle_env
Oracle env
2 parents 2e810bf + 3c089b7 commit 2ff6ac6

4 files changed

Lines changed: 12 additions & 1 deletion

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Dockerfile to test MT.
3939
|amazonlinux2023 (\*4)|amazonlinux:2023|5.32.1|8.4.6|MariaDB 10.11.11|3.2.2|-|
4040
|postgresql|fedora:41|5.40.2|8.3.22|Postgres 16.9|3.2.4|-|
4141
|oracle (\*3)|oraclelinux:7-slim|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
42-
|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.28|MariaDB 10.3.39|1.1.1k|-|
42+
|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.29|MariaDB 10.3.39|1.1.1k|-|
4343

4444
\*2 These images were used to test older versions of MT.
4545
\*3 with DBD::Oracle 1.80 + OracleInstantClient 21.7

bin/update_dockerfile.pl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,6 +1498,11 @@ sub load_prereqs {
14981498
% if ($type eq 'postgresql') {
14991499
export MT_TEST_BACKEND=Pg
15001500
% }
1501+
% if ($type =~ /oracle/) {
1502+
export MT_TEST_BACKEND=Oracle
1503+
export NLS_LANG=Japanese_Japan.AL32UTF8
1504+
export NLS_SORT=JAPANESE_M_CI
1505+
% }
15011506
15021507
exec "$@"
15031508

oracle/docker-entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ if [ -f t/cpanfile ]; then
2020
cpanm --installdeps -n . --cpanfile=t/cpanfile
2121
fi
2222

23+
export MT_TEST_BACKEND=Oracle
24+
export NLS_LANG=Japanese_Japan.AL32UTF8
25+
export NLS_SORT=JAPANESE_M_CI
2326

2427
exec "$@"

oracle8/docker-entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ if [ -f t/cpanfile ]; then
2020
cpanm --installdeps -n . --cpanfile=t/cpanfile
2121
fi
2222

23+
export MT_TEST_BACKEND=Oracle
24+
export NLS_LANG=Japanese_Japan.AL32UTF8
25+
export NLS_SORT=JAPANESE_M_CI
2326

2427
exec "$@"

0 commit comments

Comments
 (0)