Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix macOS/Colima integration test #367

Merged
merged 2 commits into from
Dec 2, 2023
Merged

Fix macOS/Colima integration test #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
881f4d8
chore
gesellix Dec 2, 2023
31f9289
Fix macOS/Colima based integration test
gesellix Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/src/test/groovy/de/gesellix/gradle/docker/DockerPluginIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class DockerPluginIntegrationTest extends Specification {
result.task(':dockerPullPrivate').outcome == TaskOutcome.SUCCESS
}

def "test push"() {
def "test push to the official registry"() {
given:
def dockerClient = new DockerClientImpl()
dockerClient.tag(testImage.imageWithTag, "gesellix/example")
Expand Down
6 changes: 5 additions & 1 deletion plugin/src/test/groovy/de/gesellix/gradle/docker/tasks/GenericDockerTaskSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ class GenericDockerTaskSpec extends Specification {
DockerClientImpl dockerClient = task.dockerClient

then:
dockerClient.env.dockerHost == DockerEnv.getDefaultDockerHost()
dockerClient.env.dockerHost in [
DockerEnv.getDefaultDockerHost(),
// for GitHub, where integration tests use a Colima based Docker engine
"unix:///Users/runner/.colima/default/docker.sock"
]
}

def "delegates to dockerClient with configured dockerHost"() {
Expand Down
Loading