Skip to content

Commit 98d5f39

Browse files
committed
General Bug Fixes. Add support for latest versions of various databases and database drivers
Fixed #145 Fixed #222 Fixed #223 Fixed #224 Fixed #225 Fixed #226 Fixed #227 Fixed #228 Fixed #229 Fixed #230 Fixed #231 Fixed #232 Fixed #233 Fixed #234 Fixed #236 Fixed #237 Fixed #238 Fixed #239 Fixed #240 Fixed #241 Fixed #242 Fixed #243
1 parent c673b3e commit 98d5f39

File tree

250 files changed

+6219
-2890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+6219
-2890
lines changed

docker/bin/runContainer.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
@set TARGET_IMAGE=%2
33
@set YADAMU_TEST_NAME=%3
44
@set CONFIGURATION_FILE=%4
5-
@set HOSTS=""
6-
if defined MSSQL14 set HOST_LIST="MSSQL14-01:%MSSQL14%"
7-
if defined HOST_LIST set HOSTS=--add-host=%HOST_LIST%
8-
REM echo %HOSTS%
95
docker stop %CONTAINER_NAME%
106
docker rm %CONTAINER_NAME%
117
for /f "tokens=1,2" %%i in ('docker info ^| findstr OSType') do set DOCKER_ENGINE=%%j
@@ -15,13 +11,17 @@ goto :eof
1511
:linuxContainer
1612
@set MAX_MEMORY="16g"
1713
@set SECURITY_OPTION="seccomp:unconfined"
14+
@set HOSTS=
15+
REM echo %HOSTS%
16+
if defined MSSQL14 set HOST_LIST="MSSQL14-01:%MSSQL14%"
17+
if defined HOST_LIST set HOSTS=--add-host=%HOST_LIST%
1818
docker run --name %CONTAINER_NAME% --network YADAMU-NET --memory %MAX_MEMORY% --security-opt %SECURITY_OPTION% -v YADAMU_01-SHARED:/usr/src/YADAMU/mnt -e YADAMU_TEST_NAME=%YADAMU_TEST_NAME% %HOSTS% -e TESTNAME=%CONFIGURATION_FILE% -d %TARGET_IMAGE%
1919
exit /b
2020
:end
2121

2222
:windowsContainer
2323
@set MAX_MEMORY="4g"
2424
@set DISC_SIZE="100GB"
25-
docker run --name %CONTAINER_NAME% --network YADAMU-NET --storage-opt "size=%DISC_SIZE%" --memory %MAX_MEMORY% -v C:\SHARED:C:\YADAMU\mnt -e YADAMU_TEST_NAME=%YADAMU_TEST_NAME% %HOST_LIST% %HOSTS% -e TESTNAME=%CONFIGURATION_FILE% -d %TARGET_IMAGE%
25+
docker run --name %CONTAINER_NAME% --network YADAMU-NET --storage-opt "size=%DISC_SIZE%" --memory %MAX_MEMORY% -v C:\SHARED:C:\YADAMU\mnt -e YADAMU_TEST_NAME=%YADAMU_TEST_NAME% -e TESTNAME=%CONFIGURATION_FILE% -d %TARGET_IMAGE%
2626
exit /b
2727
:end

docker/bin/runEverything.bat

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
1-
if defined %1 set MSSQL14=%1
2-
if not defined MSSQL14 set /p MSSQL14="SQL Server 2014 IP Address :"
3-
docker rm YADAMU-01
4-
docker run --security-opt=seccomp:unconfined --name YADAMU-01 --memory="16g" -v YADAMU_01-SHARED:/usr/src/YADAMU/mnt --network YADAMU-NET -d -e YADAMU_TEST_NAME=everything -e TESTNAME=mssql2014TestSuite --add-host="MSSQL14-01:%MSSQL14%" yadamu/secure:latest
5-
docker logs YADAMU-01
1+
@set CONTAINER_NAME=YADAMU-01
2+
docker stop %CONTAINER_NAME%
3+
docker rm %CONTAINER_NAME%
4+
for /f "tokens=1,2" %%i in ('docker info ^| findstr OSType') do set DOCKER_ENGINE=%%j
5+
if "%DOCKER_ENGINE%" == "linux" ( call :linuxContainer ) else ( call :windowsContainer)
6+
goto :eof
7+
:linuxContainer
8+
if defined %1 set MSSQL14=%1
9+
if not defined MSSQL14 set /p MSSQL14="SQL Server 2014 IP Address :"
10+
docker rm %CONTAINER_NAME%
11+
docker run --security-opt=seccomp:unconfined --name %CONTAINER_NAME% --memory="16g" -v YADAMU_01-SHARED:/usr/src/YADAMU/mnt --network YADAMU-NET -d -e YADAMU_TEST_NAME=everything -e TESTNAME=mssql2014TestSuite --add-host="MSSQL14-01:%MSSQL14%" yadamu/secure:latest
12+
docker logs %CONTAINER_NAME%
13+
exit /b
14+
:end
15+
16+
:windowsContainerSwarm
17+
@set MAX_MEMORY="4g"
18+
@set DISC_SIZE="100GB"
19+
docker run --name %CONTAINER_NAME% --network YADAMU-NET --storage-opt "size=%DISC_SIZE%" --memory %MAX_MEMORY% -v C:\SHARED:C:\YADAMU\mnt -e YADAMU_TEST_NAME=everything -e TESTNAME=mssql2014TestSuite -d yadamu/secure:latest
20+
docker logs %CONTAINER_NAME%
21+
exit /b
22+
:end
23+
24+
:windowsContainer
25+
@set MAX_MEMORY="4g"
26+
@set DISC_SIZE="100GB"
27+
@set HOSTS=--add-host="VRTCA23-01:192.168.1.236" --add-host="VRTCA10-01:192.168.1.236" --add-host="azure-01:192.168.1.236" --add-host="minio-01:192.168.1.236"
28+
docker run --name %CONTAINER_NAME% --network YADAMU-NET --storage-opt "size=%DISC_SIZE%" --memory %MAX_MEMORY% -v C:\SHARED:C:\YADAMU\mnt %HOSTS% -e YADAMU_TEST_NAME=everything -e TESTNAME=mssql2014TestSuite -d yadamu/secure:latest
29+
docker logs %CONTAINER_NAME%
30+
exit /b
31+
:end

docker/dockerfiles/linux/COCKROACH-01.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
version: '2.4'
22
services:
3+
34
ROACH01-01:
45
container_name: ROACH01-01
56
image: cockroachdb/cockroach
6-
command: start --insecure --store=node1 --join=ROACH01-01,ROACH01-02,ROACH01-03
7+
command: start --advertise-addr=ROACH01-01:26357 --listen-addr=ROACH01-01:26357 --http-addr=ROACH01-01:8080 --sql-addr=ROACH01-01:26257 --insecure --store=node1 --join=ROACH01-01,ROACH01-02,ROACH01-03
78
mem_limit: '8gb'
89
shm_size: '1gb'
910
security_opt:
@@ -21,16 +22,16 @@ services:
2122
ROACH01-02:
2223
container_name: ROACH01-02
2324
image: cockroachdb/cockroach
24-
command: start --insecure --store=node2 --join=ROACH01-01,ROACH01-02,ROACH01-03
25+
command: start --advertise-addr=ROACH01-02:26357 --listen-addr=ROACH01-02:26357 --http-addr=ROACH01-02:8081 --sql-addr=ROACH01-02:26258 --insecure --join=ROACH01-01,ROACH01-02,ROACH01-03
2526
mem_limit: '8gb'
2627
shm_size: '1gb'
2728
security_opt:
2829
- seccomp:unconfined
2930
networks:
3031
- YADAMU-NET
3132
ports:
32-
- "26258:26257"
33-
- "8081:8080"
33+
- "26258:26258"
34+
- "8081:8081"
3435
volumes:
3536
- YADAMU_01-SHARED:/mnt/shared
3637
- ROACH01-02-DATA:/cockroach/cockroach-data
@@ -39,16 +40,16 @@ services:
3940
ROACH01-03:
4041
container_name: ROACH01-03
4142
image: cockroachdb/cockroach
42-
command: start --insecure --store=node3 --join=ROACH01-01,ROACH01-02,ROACH01-03
43+
command: start --advertise-addr=ROACH01-03:26357 --listen-addr=ROACH01-03:26357 --http-addr=ROACH01-03:8082 --sql-addr=ROACH01-03:26259 --insecure --join=ROACH01-01,ROACH01-02,ROACH01-03
4344
mem_limit: '8gb'
4445
shm_size: '1gb'
4546
security_opt:
4647
- seccomp:unconfined
4748
networks:
4849
- YADAMU-NET
4950
ports:
50-
- "26259:26257"
51-
- "8082:8080"
51+
- "26259:26259"
52+
- "8082:8082"
5253
volumes:
5354
- YADAMU_01-SHARED:/mnt/shared
5455
- ROACH01-03-DATA:/cockroach/cockroach-data

docker/dockerfiles/linux/ORA1210-01.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
version: "2.4"
22
services:
33

4-
54
ORA1210-01:
65
container_name: ORA1210-01
76
# image: oracle/database:12.1.0.2-ee
87
image: yadamu/oracle:12.1
9-
mem_limit: '12gb'
8+
mem_limit: '10gb'
109
shm_size: '4gb'
1110
security_opt:
1211
- seccomp:unconfined

docker/dockerfiles/linux/ORA2103-01.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
container_name: ORA2103-01
66
# image: oracle/database:21.3.0-ee
77
image: yadamu/oracle:21.3.0
8-
mem_limit: '10gb'
8+
mem_limit: '16gb'
99
shm_size: '4gb'
1010
security_opt:
1111
- seccomp:unconfined

docker/dockerfiles/linux/ORA2303-01.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
container_name: ORA2303-01
66
# image: oracle/database:21.3.0-ee
77
image: container-registry.oracle.com/database/free:latest
8-
mem_limit: '12gb'
8+
mem_limit: '16gb'
99
security_opt:
1010
- seccomp:unconfined
1111
shm_size: '4gb'

docker/dockerfiles/linux/YADAMU-01.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
networks:
1212
- YADAMU-NET
1313
volumes:
14-
- YADAMU_01-SHARED:/mnt/shared
14+
- YADAMU_01-SHARED:/usr/src/YADAMU/mnt
1515
restart: always
1616

1717
networks:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: "2.4"
2+
services:
3+
4+
YADAMU-DEV:
5+
container_name: YADAMU-DEV
6+
image: yadamu/secure:latest
7+
entrypoint: sleep 365d
8+
mem_limit: '16g'
9+
security_opt:
10+
- seccomp:unconfined
11+
networks:
12+
- YADAMU-NET
13+
volumes:
14+
- YADAMU_01-SHARED:/usr/src/YADAMU/mnt
15+
restart: always
16+
17+
networks:
18+
YADAMU-NET:
19+
name: YADAMU-NET
20+
21+
22+
volumes:
23+
YADAMU_01-SHARED:
24+
name: YADAMU_01-SHARED
25+
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: "2.4"
2+
services:
3+
4+
YADAMU-WTF:
5+
container_name: YADAMU-WTF
6+
image: yadamu/wtf:latest
7+
entrypoint: sleep 365d
8+
mem_limit: '16g'
9+
security_opt:
10+
- seccomp:unconfined
11+
networks:
12+
- YADAMU-NET
13+
volumes:
14+
- YADAMU_01-SHARED:/usr/src/YADAMU/mnt
15+
restart: always
16+
17+
networks:
18+
YADAMU-NET:
19+
name: YADAMU-NET
20+
21+
22+
volumes:
23+
YADAMU_01-SHARED:
24+
name: YADAMU_01-SHARED
25+

docker/dockerfiles/linux/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
tmpfs: /dev/shm/:rw,nosuid,nodev,exec,size=4g
1515
environment:
1616
TNS_ADMIN: /usr/src/YADAMU
17-
YADAMU_PASSPHRAS: yabasc
17+
YADAMU_PASSPHRASE: yabasc
1818
networks:
1919
- YADAMU-NET
2020
ports:

0 commit comments

Comments
 (0)