Skip to content

Commit 4b89a02

Browse files
marko-bekhtamarko-bekhta
authored
Add testing for Cockroach DB 26 / Add testing for MySQL 9.7 / Use newer versions of MSSQL / Make dependabot see the compose files (hibernate#12361)
* Make dependabot "discover" compose files * Add Cockroach 26 for testing and use it by default * Update MSSQL versions * Change the --wait approach to something that should work on podman-compose backend too
1 parent e57dbd7 commit 4b89a02

52 files changed

Lines changed: 253 additions & 129 deletions

File tree

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,25 @@ updates:
158158
- dependency-name: "org.slf4j:*"
159159
update-types: ["version-update:semver-major"]
160160
# Monitor docker images in compose files for database version updates
161-
- package-ecosystem: docker
162-
directory: "/docker-compose/latest"
161+
- package-ecosystem: docker-compose
162+
directories:
163+
- "/docker-compose/latest/cockroachdb"
164+
- "/docker-compose/latest/db2"
165+
- "/docker-compose/latest/db2_spatial"
166+
- "/docker-compose/latest/edb"
167+
- "/docker-compose/latest/gaussdb"
168+
- "/docker-compose/latest/hana"
169+
- "/docker-compose/latest/informix"
170+
- "/docker-compose/latest/mariadb"
171+
- "/docker-compose/latest/mssql"
172+
- "/docker-compose/latest/mysql"
173+
- "/docker-compose/latest/oracle"
174+
- "/docker-compose/latest/postgresql"
175+
- "/docker-compose/latest/spanner"
176+
- "/docker-compose/latest/sybase"
177+
- "/docker-compose/latest/tidb"
163178
schedule:
164179
interval: monthly
165-
open-pull-requests-limit: 10
166180
groups:
167181
database-images:
168182
patterns:

‎docker-compose/latest/cockroachdb/docker-compose.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
services:
2+
cockroach:
3+
image: ${COCKROACHDB_IMAGE:-cockroachdb/cockroach:v26.1.3@sha256:2161518dc0ac731b9329f5a9bade5d93989f465633c370ec2b4e6201233b9922}
4+
container_name: cockroach
5+
ports:
6+
- "26257:26257"
7+
- "8080:8080"
8+
command:
9+
- start-single-node
10+
- --insecure
11+
- --store=type=mem,size=0.25
12+
- --advertise-addr=localhost
13+
- |
14+
--log=sinks:
15+
stderr:
16+
channels: all
17+
filter: ERROR
18+
redact: false
19+
exit-on-error: true
20+
deploy:
21+
resources:
22+
limits:
23+
memory: 6g
24+
healthcheck:
25+
test: ["CMD-SHELL", "./cockroach sql --insecure -e 'SELECT 1'"]
26+
interval: 10s
27+
timeout: 5s
28+
retries: 10

docker-compose/latest/db2.yml renamed to docker-compose/latest/db2/docker-compose.yaml

File renamed without changes.

‎docker-compose/latest/db2/osx-override.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
db2:
3+
platform: linux/amd64
4+
environment:
5+
IS_OSXFS: "true"
6+
volumes:
7+
- ${db2_install_script}:/db2install.sh
8+
entrypoint: ["/bin/bash", "-c", "/db2install.sh"]

docker-compose/latest/db2_spatial.yml renamed to docker-compose/latest/db2_spatial/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
TO_CREATE_SAMPLEDB: "false"
1616
REPODB: "false"
1717
volumes:
18-
- ../build-config/db2_spatial/ewkt.sql:/conf/ewkt.sql
18+
- ../../build-config/db2_spatial/ewkt.sql:/conf/ewkt.sql
1919
shm_size: 2g
2020
healthcheck:
2121
test: ["CMD-SHELL", "su - orm_test -c 'source ~/sqllib/db2profile && db2 connect to orm_test && db2 connect reset'"]

‎docker-compose/latest/db2_spatial/osx-override.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
db2spatial:
3+
platform: linux/amd64
4+
environment:
5+
IS_OSXFS: "true"
6+
volumes:
7+
- ${db2_install_script}:/db2install.sh
8+
entrypoint: ["/bin/bash", "-c", "/db2install.sh"]

docker-compose/latest/edb.yml renamed to docker-compose/latest/edb/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ services:
44
container_name: edb
55
platform: ${POSTGRESQL_PLATFORM:-linux/amd64}
66
build:
7-
context: ../build-config/edb
8-
dockerfile: edb17.Dockerfile
7+
context: ../../build-config/edb
8+
dockerfile: ../../build-config/edb/edb17.Dockerfile
99
platforms:
1010
- ${POSTGRESQL_PLATFORM:-linux/amd64}
1111
environment:

docker-compose/latest/gaussdb.yml renamed to docker-compose/latest/gaussdb/docker-compose.yaml

File renamed without changes.

docker-compose/latest/hana.yml renamed to docker-compose/latest/hana/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
kernel.shmmni: 4096
3131
kernel.shmall: 8388608
3232
volumes:
33-
- ../build-config/hana:/config:Z
33+
- ../../build-config/hana:/config:Z
3434
healthcheck:
3535
test: ["CMD-SHELL", "/usr/sap/HXE/HDB90/exe/hdbsql -i 90 -d HXE -u SYSTEM -p H1bernate_test 'SELECT * FROM DUMMY'"]
3636
interval: 10s

docker-compose/latest/informix.yml renamed to docker-compose/latest/informix/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
LICENSE: accept
1010
GL_USEGLU: "1"
1111
volumes:
12-
- ../build-config/informix/onconfig.mod:/opt/ibm/config/onconfig.mod
12+
- ../../build-config/informix/onconfig.mod:/opt/ibm/config/onconfig.mod
1313
healthcheck:
1414
test: [ "CMD-SHELL", "export INFORMIXDIR=/opt/ibm/informix INFORMIXSERVER=informix PATH=/opt/ibm/informix/bin:$$PATH && echo 'SELECT FIRST 1 tk_id FROM ph_task;' | dbaccess sysadmin > /dev/null 2>&1" ]
1515
interval: 10s

0 commit comments

Comments
 (0)