Update dind-images

renovate[bot] · web-flow · commit d7c37e021809 · 2024-04-07T10:39:13.000Z
diff --git a/Earthfile b/Earthfile
@@ -131,7 +131,7 @@ lint-scripts:
 earthly-script-no-stdout:
     # This validates the ./earthly script doesn't print anything to stdout (it should print to stderr)
     # This is to ensure commands such as: MYSECRET="$(./earthly secrets get -n /user/my-secret)" work
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     RUN apk add --no-cache --update bash
     COPY earthly .earthly_version_flag_overrides .
 
diff --git a/ast/tests/with-docker.ast.json b/ast/tests/with-docker.ast.json
@@ -3,7 +3,7 @@
     {
       "command": {
         "args": [
-          "earthly/dind:alpine-3.19-docker-25.0.2-r0"
+          "earthly/dind:alpine-3.19-docker-25.0.3-r2"
         ],
         "name": "FROM"
       }
@@ -813,7 +813,7 @@
         {
           "command": {
             "args": [
-              "earthly/dind:alpine-3.19-docker-25.0.2-r0"
+              "earthly/dind:alpine-3.19-docker-25.0.3-r2"
             ],
             "name": "FROM"
           }
@@ -872,7 +872,7 @@
         {
           "command": {
             "args": [
-              "earthly/dind:alpine-3.19-docker-25.0.2-r0"
+              "earthly/dind:alpine-3.19-docker-25.0.3-r2"
             ],
             "name": "FROM"
           }
@@ -930,8 +930,8 @@
           "command": {
             "args": [
               "+cgroup-v2-test",
-              "--DIND_IMG=earthly/dind:alpine-3.19-docker-25.0.2-r0",
-              "--DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.5-1"
+              "--DIND_IMG=earthly/dind:alpine-3.19-docker-25.0.3-r2",
+              "--DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.9-1"
             ],
             "name": "BUILD"
           }
diff --git a/earthfile2llb/with_docker_run_base.go b/earthfile2llb/with_docker_run_base.go
@@ -20,7 +20,7 @@ const (
 	dockerdWrapperPath          = "/var/earthly/dockerd-wrapper.sh"
 	dockerAutoInstallScriptPath = "/var/earthly/docker-auto-install.sh"
 	composeConfigFile           = "compose-config.yml"
-	suggestedDINDImage          = "earthly/dind:alpine-3.18-docker-24.0.2-r0"
+	suggestedDINDImage          = "earthly/dind:alpine-3.19-docker-25.0.3-r2"
 )
 
 // DockerLoadOpt holds parameters for WITH DOCKER --load parameter.
diff --git a/inputgraph/testdata/with-docker/Earthfile b/inputgraph/testdata/with-docker/Earthfile
@@ -9,28 +9,28 @@ load-target:
     SAVE IMAGE saved:latest
 
 with-docker-load:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load saved:latest=+load-target
          RUN echo "loaded"
     END
 
 with-docker-load-no-alias:
     BUILD +load-target
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load +load-target
          RUN echo "loaded"
     END
 
 with-docker-load-args:
     BUILD +load-target
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load foo=(+load-target --foo=2)
          RUN echo "loaded"
     END
 
 with-docker-load-remote:
     BUILD +load-target
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load foo=github.com/earthly/earthly:6610b73131f94cbe594dba3b90665748f21a9b8d+license
          RUN echo "loaded"
     END
diff --git a/scripts/tests/interactive-debugger/docker-compose/Earthfile b/scripts/tests/interactive-debugger/docker-compose/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.7
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 fail-with-docker-compose:
     WORKDIR /test
diff --git a/tests/cloud-push-pull/amazon-elastic-container-registry.earth b/tests/cloud-push-pull/amazon-elastic-container-registry.earth
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 push:
     ARG ACCT_ID
diff --git a/tests/cloud-push-pull/azure-container-registry.earth b/tests/cloud-push-pull/azure-container-registry.earth
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 push:
     RUN date | md5sum | head -c 32 > motd
diff --git a/tests/cloud-push-pull/google-artifact-repository.earth b/tests/cloud-push-pull/google-artifact-repository.earth
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 push:
     RUN date | md5sum | head -c 32 > motd
diff --git a/tests/cloud-push-pull/google-container-registry.earth b/tests/cloud-push-pull/google-container-registry.earth
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 push:
     RUN date | md5sum | head -c 32 > motd
diff --git a/tests/ssh.earth b/tests/ssh.earth
@@ -7,7 +7,7 @@ test:
     RUN --ssh test -n "$SSH_AUTH_SOCK" && ssh-add -l | grep 'rsa-key-from-earthly-tests'
 
 test-with-docker:
-    FROM earthly/dind:alpine-3.16-docker-20.10.20-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     RUN apk --update add openssh-client
     WITH DOCKER
         RUN --ssh test -n "$SSH_AUTH_SOCK" && ssh-add -l | grep 'rsa-key-from-earthly-tests'
diff --git a/tests/wait-block/save-image/Earthfile b/tests/wait-block/save-image/Earthfile
@@ -26,15 +26,15 @@ check-tag-exists-locally:
     RUN docker images "$REGISTRY/myuser/myimg:$tag" | grep "$tag"
 
 check-with-docker-pull-works:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     ARG --required REGISTRY
     ARG --required tag
     WITH DOCKER --pull $REGISTRY/myuser/myimg:$tag
         RUN docker images "$REGISTRY/myuser/myimg:$tag" | grep "$tag"
     END
 
 check-with-docker-load-works:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load mytestimg=+myimg
         RUN docker run mytestimg /bin/sh -c 'cat /special-data' | grep NWMyMTQ2Y
     END
diff --git a/tests/wait-block/with-docker-run-load/Earthfile b/tests/wait-block/with-docker-run-load/Earthfile
@@ -26,7 +26,7 @@ a-test-image:
     SAVE IMAGE $REGISTRY/myuser/myimg:$tag
 
 test:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     ARG --required REGISTRY
     ARG --required tag
     WAIT
diff --git a/tests/with-docker-compose/Earthfile b/tests/with-docker-compose/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 WORKDIR /test
 
 all:
diff --git a/tests/with-docker-expose/Earthfile b/tests/with-docker-expose/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 all:
     BUILD +test-single
diff --git a/tests/with-docker-kind/Earthfile b/tests/with-docker-kind/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 ARG --global KIND_VERSION=0.20.0
 
@@ -8,7 +8,7 @@ all:
     BUILD +ubuntu-kind
 
 alpine-kind:
-    ARG DIND_IMAGE=earthly/dind:alpine-3.18-docker-25.0.1-r0
+    ARG DIND_IMAGE=earthly/dind:alpine-3.19-docker-25.0.3-r2
     FROM $DIND_IMAGE
     RUN apk add curl
     RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v$KIND_VERSION/kind-linux-amd64 && chmod +x kind
@@ -17,7 +17,7 @@ alpine-kind:
     END
 
 ubuntu-kind:
-    ARG DIND_IMAGE=earthly/dind:ubuntu-23.04-docker-24.0.5-1
+    ARG DIND_IMAGE=earthly/dind:ubuntu-23.04-docker-24.0.9-1
     FROM $DIND_IMAGE
     RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v$KIND_VERSION/kind-linux-amd64 && chmod +x kind
     WITH DOCKER
diff --git a/tests/with-docker-registry/Earthfile b/tests/with-docker-registry/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
 
 all:
     BUILD +empty-test
diff --git a/tests/with-docker-via-command/Earthfile b/tests/with-docker-via-command/Earthfile
@@ -11,6 +11,6 @@ MY_COMMAND_WITH_DOCKER:
     END
 
 test:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     DO +MY_COMMAND_WITH_DOCKER --MY_ARG="myvalue"
     DO +MY_COMMAND_WITH_DOCKER
diff --git a/tests/with-docker/Earthfile b/tests/with-docker/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-ARG --global DIND_IMAGE=earthly/dind:alpine-3.18-docker-25.0.1-r0
+ARG --global DIND_IMAGE=earthly/dind:alpine-3.19-docker-25.0.3-r2
 FROM $DIND_IMAGE
 
 all:
@@ -139,7 +139,7 @@ multi-from-two:
     FROM alpine:latest
 
 one-target-many-names:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER \
             --load a:latest=+multi-from-one \  # Test that there can be multiple names assigned to an image from a single target
             --load b:latest=+multi-from-one \
@@ -153,7 +153,7 @@ one-target-many-names:
     END
 
 if-after:
-    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    FROM earthly/dind:alpine-3.19-docker-25.0.3-r2
     WITH DOCKER --load a:latest=+multi-from-one
         RUN docker run a:latest
     END
@@ -164,8 +164,8 @@ if-after:
 
 cgroup-v2-test-all:
     BUILD +cgroup-v2-test \
-        --DIND_IMG=earthly/dind:alpine-3.18-docker-25.0.1-r0 \
-        --DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.5-1
+        --DIND_IMG=earthly/dind:alpine-3.19-docker-25.0.3-r2 \
+        --DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.9-1
 
 cgroup-v2-test:
     ARG --required DIND_IMG

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"command": {`
`5`	`5`	`"args": [`
`6`		`- "earthly/dind:alpine-3.19-docker-25.0.2-r0"`
	`6`	`+ "earthly/dind:alpine-3.19-docker-25.0.3-r2"`
`7`	`7`	`],`
`8`	`8`	`"name": "FROM"`
`9`	`9`	`}`
`@@ -813,7 +813,7 @@`
`813`	`813`	`{`
`814`	`814`	`"command": {`
`815`	`815`	`"args": [`
`816`		`- "earthly/dind:alpine-3.19-docker-25.0.2-r0"`
	`816`	`+ "earthly/dind:alpine-3.19-docker-25.0.3-r2"`
`817`	`817`	`],`
`818`	`818`	`"name": "FROM"`
`819`	`819`	`}`
`@@ -872,7 +872,7 @@`
`872`	`872`	`{`
`873`	`873`	`"command": {`
`874`	`874`	`"args": [`
`875`		`- "earthly/dind:alpine-3.19-docker-25.0.2-r0"`
	`875`	`+ "earthly/dind:alpine-3.19-docker-25.0.3-r2"`
`876`	`876`	`],`
`877`	`877`	`"name": "FROM"`
`878`	`878`	`}`
`@@ -930,8 +930,8 @@`
`930`	`930`	`"command": {`
`931`	`931`	`"args": [`
`932`	`932`	`"+cgroup-v2-test",`
`933`		`- "--DIND_IMG=earthly/dind:alpine-3.19-docker-25.0.2-r0",`
`934`		`- "--DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.5-1"`
	`933`	`+ "--DIND_IMG=earthly/dind:alpine-3.19-docker-25.0.3-r2",`
	`934`	`+ "--DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.9-1"`
`935`	`935`	`],`
`936`	`936`	`"name": "BUILD"`
`937`	`937`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const (`
`20`	`20`	`dockerdWrapperPath = "/var/earthly/dockerd-wrapper.sh"`
`21`	`21`	`dockerAutoInstallScriptPath = "/var/earthly/docker-auto-install.sh"`
`22`	`22`	`composeConfigFile = "compose-config.yml"`
`23`		`- suggestedDINDImage = "earthly/dind:alpine-3.18-docker-24.0.2-r0"`
	`23`	`+ suggestedDINDImage = "earthly/dind:alpine-3.19-docker-25.0.3-r2"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// DockerLoadOpt holds parameters for WITH DOCKER --load parameter.`