Skip to content

Commit b29c4a9

Browse files
Jasmine-geJasmine-ge
authored
Merge branch 'main' into add_timeplus_container
2 parents 69a6974 + b27316d commit b29c4a9

File tree

175 files changed

+2052
-479
lines changed

Some content is hidden

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

175 files changed

+2052
-479
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ body:
2727
- Dynalite
2828
- Elasticsearch
2929
- GCloud
30+
- Grafana
3031
- HiveMQ
3132
- InfluxDB
3233
- K3S

‎.github/ISSUE_TEMPLATE/enhancement.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ body:
2727
- Dynalite
2828
- Elasticsearch
2929
- GCloud
30+
- Grafana
3031
- HiveMQ
3132
- InfluxDB
3233
- K3S

‎.github/ISSUE_TEMPLATE/feature.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ body:
2727
- Dynalite
2828
- Elasticsearch
2929
- GCloud
30+
- Grafana
3031
- HiveMQ
3132
- InfluxDB
3233
- K3S
@@ -84,7 +85,7 @@ body:
8485
id: benefit
8586
attributes:
8687
label: Benefit
87-
description: What's the benefit of addng this feature to the project?
88+
description: What's the benefit of adding this feature to the project?
8889
validations:
8990
required: true
9091
- type: textarea

‎.github/dependabot.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ updates:
2222
update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
2323
- dependency-name: "org.apache.commons:commons-compress"
2424
update-types: [ "version-update:semver-minor" ]
25+
- dependency-name: "org.awaitility:awaitility"
26+
update-types: [ "version-update:semver-patch" ]
2527
- package-ecosystem: "gradle"
2628
directory: "/"
2729
allow:
@@ -76,6 +78,9 @@ updates:
7678
schedule:
7779
interval: "weekly"
7880
open-pull-requests-limit: 10
81+
ignore:
82+
- dependency-name: "org.awaitility:awaitility"
83+
update-types: [ "version-update:semver-patch" ]
7984
- package-ecosystem: "gradle"
8085
directory: "/modules/cratedb"
8186
schedule:
@@ -106,6 +111,11 @@ updates:
106111
schedule:
107112
interval: "weekly"
108113
open-pull-requests-limit: 10
114+
- package-ecosystem: "gradle"
115+
directory: "/modules/grafana"
116+
schedule:
117+
interval: "weekly"
118+
open-pull-requests-limit: 10
109119
- package-ecosystem: "gradle"
110120
directory: "/modules/hivemq"
111121
schedule:
@@ -116,6 +126,9 @@ updates:
116126
schedule:
117127
interval: "weekly"
118128
open-pull-requests-limit: 10
129+
ignore:
130+
- dependency-name: "com.influxdb:influxdb-java-client"
131+
update-types: [ "version-update:semver-major" ]
119132
- package-ecosystem: "gradle"
120133
directory: "/modules/jdbc"
121134
schedule:
@@ -272,6 +285,9 @@ updates:
272285
schedule:
273286
interval: "weekly"
274287
open-pull-requests-limit: 10
288+
ignore:
289+
- dependency-name: "org.awaitility:awaitility"
290+
update-types: [ "version-update:semver-patch" ]
275291
- package-ecosystem: "gradle"
276292
directory: "/modules/r2dbc"
277293
schedule:
@@ -306,6 +322,8 @@ updates:
306322
ignore:
307323
- dependency-name: "org.apache.qpid:qpid-jms-client"
308324
update-types: [ "version-update:semver-major" ]
325+
- dependency-name: "org.awaitility:awaitility"
326+
update-types: [ "version-update:semver-patch" ]
309327
- package-ecosystem: "gradle"
310328
directory: "/modules/solr"
311329
schedule:
@@ -376,6 +394,20 @@ updates:
376394
update-types: [ "version-update:semver-major" ]
377395
- dependency-name: "com.diffplug.spotless"
378396
update-types: [ "version-update:semver-minor" ]
397+
- dependency-name: "com.hazelcast:hazelcast"
398+
update-types: [ "version-update:semver-minor" ]
399+
400+
# Smoke test
401+
- package-ecosystem: "gradle"
402+
directory: "/smoke-test"
403+
schedule:
404+
interval: "weekly"
405+
open-pull-requests-limit: 10
406+
ignore:
407+
- dependency-name: "ch.qos.logback:logback-classic"
408+
update-types: [ "version-update:semver-minor" ]
409+
- dependency-name: "com.diffplug.spotless"
410+
update-types: [ "version-update:semver-minor" ]
379411

380412
# GitHub Actions
381413
- package-ecosystem: "github-actions"

‎.github/labeler.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
- core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
66
- core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
77
- core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
8+
- core/src/test/java/org/testcontainers/containers/Compose*Test.java
9+
- core/src/test/java/org/testcontainers/containers/DockerCompose*Test.java
10+
- core/src/test/java/org/testcontainers/junit/Compose*Test.java
11+
- core/src/test/java/org/testcontainers/junit/DockerCompose*Test.java
812
"github_actions":
913
- changed-files:
1014
- any-glob-to-any-file:
@@ -67,6 +71,10 @@
6771
- changed-files:
6872
- any-glob-to-any-file:
6973
- modules/gcloud/**/*
74+
"modules/grafana":
75+
- changed-files:
76+
- any-glob-to-any-file:
77+
- modules/grafana/**/*
7078
"modules/hivemq":
7179
- changed-files:
7280
- any-glob-to-any-file:

‎.github/settings.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ labels:
145145
- name: modules/gcloud
146146
color: '#006b75'
147147

148+
- name: modules/grafana
149+
color: '#006b75'
150+
148151
- name: modules/hivemq
149152
color: '#006b75'
150153

‎.github/workflows/ci-windows.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: CI - Windows
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- '.github/ISSUE_TEMPLATE/*.yaml'
7+
- '.github/CODEOWNERS'
8+
- '.github/pull_request_template.md'
9+
- 'docs/**/*.css'
10+
- 'docs/**/*.html'
11+
- 'docs/**/*.ico'
12+
- 'docs/**/*.md'
13+
- 'docs/**/*.png'
14+
- 'docs/**/*.svg'
15+
- 'mkdocs.yml'
16+
- 'README.md'
17+
- 'RELEASING.md'
18+
- '.sdkmanrc'
19+
push:
20+
branches: [ main ]
21+
paths-ignore:
22+
- '.github/ISSUE_TEMPLATE/*.yaml'
23+
- '.github/CODEOWNERS'
24+
- '.github/pull_request_template.md'
25+
- 'docs/**/*.css'
26+
- 'docs/**/*.html'
27+
- 'docs/**/*.ico'
28+
- 'docs/**/*.md'
29+
- 'docs/**/*.png'
30+
- 'docs/**/*.svg'
31+
- 'mkdocs.yml'
32+
- 'README.md'
33+
- 'RELEASING.md'
34+
- '.sdkmanrc'
35+
36+
concurrency:
37+
group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
38+
cancel-in-progress: true
39+
40+
permissions:
41+
contents: read
42+
43+
jobs:
44+
core:
45+
runs-on: self-hosted
46+
permissions:
47+
checks: write
48+
steps:
49+
- uses: actions/checkout@v4
50+
- name: Build with Gradle
51+
run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
52+
- uses: ./.github/actions/setup-junit-report

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ permissions:
4343
env:
4444
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
4545
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
46-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
47-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
46+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4847

4948
jobs:
5049
core:

‎.github/workflows/combine-prs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
steps:
1414
- name: combine-prs
1515
id: combine-prs
16-
uses: github/combine-prs@v5.0.0
16+
uses: github/combine-prs@v5.1.0
1717
with:
1818
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/moby-latest.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Tests against recent Docker engine releases
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# nightly build, at 23:59 CEST
7+
- cron: '59 23 * * *'
8+
9+
jobs:
10+
test_docker:
11+
strategy:
12+
matrix:
13+
install-docker-type: ["STABLE", "ROOTLESS", "ROOTFUL"]
14+
name: "Core tests using Docker ${{ matrix.install-docker-type }}"
15+
runs-on: ubuntu-22.04
16+
continue-on-error: true
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: ./.github/actions/setup-build
20+
21+
- name: Install Stable Docker
22+
if: ${{ matrix.install-docker-type == 'STABLE' }}
23+
run: curl https://get.docker.com
24+
25+
- name: Install Docker from the TEST channel
26+
if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
27+
run: curl https://get.docker.com | CHANNEL=test sh
28+
29+
- name: Setup rootless Docker
30+
if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
31+
uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886 # v0.2.2
32+
33+
- name: Remove Docker root socket
34+
if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
35+
run: sudo rm -rf /var/run/docker.sock
36+
37+
- name: Check Docker version
38+
run: docker version
39+
40+
- name: Build with Gradle
41+
run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_${{ matrix.install-docker-type }} testcontainers:test -Dorg.gradle.caching=false
42+
- uses: ./.github/actions/setup-junit-report
43+
44+
- name: Notify to Slack on failures
45+
if: failure()
46+
id: slack
47+
uses: slackapi/[email protected]
48+
with:
49+
payload: |
50+
{
51+
"tc_project": "testcontainers-java",
52+
"tc_docker_install_type": "${{ matrix.install-docker-type }}",
53+
"tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
54+
"tc_github_action_status": "FAILED",
55+
"tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
56+
}
57+
env:
58+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCKER_LATEST_WEBHOOK }}

0 commit comments

Comments
 (0)