Skip to content

Commit a278a30

Browse files
committed
Use a smaller container in tests that pull
...where possible. The alpine image is small but hello-world is smaller. Authored-by: Leonhardt Koepsell <hello@lnhrdt.com>
1 parent 5f077fa commit a278a30

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

src/testFeatures/kotlin/dev/codebandits/container/gradle/DockerPullTest.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import strikt.assertions.contains
99
import strikt.assertions.isEqualTo
1010
import strikt.assertions.isNotNull
1111
import strikt.assertions.isTrue
12-
import java.util.UUID
12+
import java.util.*
1313

1414
class DockerPullTest : GradleProjectTest() {
1515

1616
@Test
1717
fun `dockerPull pulls the specified image`() {
18-
removeImage("alpine:3.18.9")
18+
removeImage("hello-world:latest")
1919

2020
buildGradleKtsFile.appendLine(
2121
"""
@@ -26,9 +26,9 @@ class DockerPullTest : GradleProjectTest() {
2626
}
2727
2828
tasks {
29-
register<ContainerTask>("pullAlpineImage") {
29+
register<ContainerTask>("pullImage") {
3030
dockerPull {
31-
image = "alpine:3.18.9"
31+
image = "hello-world:latest"
3232
}
3333
}
3434
}
@@ -38,14 +38,14 @@ class DockerPullTest : GradleProjectTest() {
3838
val result = GradleRunner.create()
3939
.withPluginClasspath()
4040
.withProjectDir(projectDirectory.toFile())
41-
.withArguments("pullAlpineImage")
41+
.withArguments("pullImage")
4242
.build()
4343

4444
expectThat(result).and {
45-
get { task(":pullAlpineImage") }.isNotNull().get { outcome }.isEqualTo(TaskOutcome.SUCCESS)
45+
get { task(":pullImage") }.isNotNull().get { outcome }.isEqualTo(TaskOutcome.SUCCESS)
4646
}
4747

48-
expectThat(imageExists("alpine:3.18.9")).isTrue()
48+
expectThat(imageExists("hello-world:latest")).isTrue()
4949
}
5050

5151
@Test
@@ -95,4 +95,3 @@ class DockerPullTest : GradleProjectTest() {
9595
return exitCode == 0
9696
}
9797
}
98-

src/testFeatures/kotlin/dev/codebandits/container/gradle/DockerRemoveTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DockerRemoveTest : GradleProjectTest() {
1515

1616
@Test
1717
fun `dockerRemove removes the specified image`() {
18-
pullImage("alpine:3.18.9")
18+
pullImage("hello-world:latest")
1919

2020
buildGradleKtsFile.appendLine(
2121
"""
@@ -26,9 +26,9 @@ class DockerRemoveTest : GradleProjectTest() {
2626
}
2727
2828
tasks {
29-
register<ContainerTask>("removeAlpineImage") {
29+
register<ContainerTask>("removeImage") {
3030
dockerRemove {
31-
image = "alpine:3.18.9"
31+
image = "hello-world:latest"
3232
}
3333
}
3434
}
@@ -38,14 +38,14 @@ class DockerRemoveTest : GradleProjectTest() {
3838
val result = GradleRunner.create()
3939
.withPluginClasspath()
4040
.withProjectDir(projectDirectory.toFile())
41-
.withArguments("removeAlpineImage")
41+
.withArguments("removeImage")
4242
.build()
4343

4444
expectThat(result).and {
45-
get { task(":removeAlpineImage") }.isNotNull().get { outcome }.isEqualTo(TaskOutcome.SUCCESS)
45+
get { task(":removeImage") }.isNotNull().get { outcome }.isEqualTo(TaskOutcome.SUCCESS)
4646
}
4747

48-
expectThat(imageExists("alpine:3.18.9")).isFalse()
48+
expectThat(imageExists("hello-world:latest")).isFalse()
4949
}
5050

5151
@Test

src/testFeatures/kotlin/dev/codebandits/container/gradle/TaskImagesTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class TaskImagesTest : GradleProjectTest() {
162162
163163
tasks {
164164
register("useImage") {
165-
inputRegistryImage("alpine:latest")
165+
inputRegistryImage("hello-world:latest")
166166
outputs.upToDateWhen { true }
167167
doLast { }
168168
}
@@ -205,7 +205,7 @@ class TaskImagesTest : GradleProjectTest() {
205205
206206
tasks {
207207
register("useImage") {
208-
inputRegistryImage("docker.io/library/alpine:latest")
208+
inputRegistryImage("docker.io/library/hello-world:latest")
209209
outputs.upToDateWhen { true }
210210
doLast { }
211211
}

0 commit comments

Comments
 (0)