diff --git a/Earthfile b/Earthfile index 4326178f28..d0b7eaf130 100644 --- 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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 RUN apk add --no-cache --update bash COPY earthly .earthly_version_flag_overrides . diff --git a/ast/tests/with-docker-compose.ast.json b/ast/tests/with-docker-compose.ast.json index 43a9ac3b28..1ed0e924cb 100644 --- a/ast/tests/with-docker-compose.ast.json +++ b/ast/tests/with-docker-compose.ast.json @@ -5,7 +5,7 @@ "args": [ "DIND_IMAGE", "=", - "earthly/dind:alpine-3.19-docker-25.0.5-r0" + "earthly/dind:alpine-3.20-docker-26.1.3-r2" ], "name": "ARG" } diff --git a/ast/tests/with-docker.ast.json b/ast/tests/with-docker.ast.json index 0c5fdcf863..c3b65a98b3 100644 --- a/ast/tests/with-docker.ast.json +++ b/ast/tests/with-docker.ast.json @@ -6,7 +6,7 @@ "--global", "DIND_IMAGE", "=", - "earthly/dind:alpine-3.19-docker-25.0.5-r0" + "earthly/dind:alpine-3.20-docker-26.1.3-r2" ], "name": "ARG" } diff --git a/earthfile2llb/with_docker_run_base.go b/earthfile2llb/with_docker_run_base.go index 2e565d5dbc..fd2958d4ef 100644 --- a/earthfile2llb/with_docker_run_base.go +++ b/earthfile2llb/with_docker_run_base.go @@ -21,7 +21,7 @@ const ( dockerdWrapperPath = "/var/earthly/dockerd-wrapper.sh" dockerAutoInstallScriptPath = "/var/earthly/docker-auto-install.sh" composeConfigFile = "compose-config.yml" - suggestedDINDImage = "earthly/dind:alpine-3.19-docker-25.0.5-r0" + suggestedDINDImage = "earthly/dind:alpine-3.20-docker-26.1.3-r2" ) // DockerLoadOpt holds parameters for WITH DOCKER --load parameter. diff --git a/inputgraph/testdata/with-docker/Earthfile b/inputgraph/testdata/with-docker/Earthfile index 224d60cb41..3af5d8cef4 100644 --- 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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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 index 240fe619d3..25c06946fe 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 fail-with-docker-compose: WORKDIR /test diff --git a/tests/aws-flag.earth b/tests/aws-flag.earth index fcd73d6763..256062f82b 100644 --- a/tests/aws-flag.earth +++ b/tests/aws-flag.earth @@ -12,7 +12,7 @@ oidc: RUN --aws --oidc=$OIDC echo this should not succeed oidc-with-docker: - FROM earthly/dind:alpine-3.20-docker-26.1.3-r1 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 ARG OIDC="" diff --git a/tests/cloud-push-pull/amazon-elastic-container-registry.earth b/tests/cloud-push-pull/amazon-elastic-container-registry.earth index b2f5723488..4d8db76245 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.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 index 2a59e21069..fdb68343bb 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.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 index aeb4ca0703..87f823a95d 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.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 index 201c5c1a7a..26ea8f27ea 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 push: RUN date | md5sum | head -c 32 > motd diff --git a/tests/oidc/aws.earth b/tests/oidc/aws.earth index 367c1617f5..f5d8132617 100644 --- a/tests/oidc/aws.earth +++ b/tests/oidc/aws.earth @@ -15,7 +15,7 @@ oidc: test $result -eq $expected || (echo "expected $expected env vars for AWS but got $result" && exit 1) oidc-with-docker: - FROM earthly/dind:alpine-3.20-docker-26.1.3-r1 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 # set baseline - expects no envs with AWS_ prefix LET expected=0 diff --git a/tests/ssh.earth b/tests/ssh.earth index 977773e0c1..80cde26ee5 100644 --- 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.19-docker-25.0.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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/visited-upfront-hash-collection.earth b/tests/visited-upfront-hash-collection.earth index 65e859c24f..5b9158ca89 100644 --- a/tests/visited-upfront-hash-collection.earth +++ b/tests/visited-upfront-hash-collection.earth @@ -1,6 +1,6 @@ VERSION 0.8 -FROM earthly/dind:alpine-3.19-docker-25.0.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 parallel: BUILD +test-executor --INDEX=1 diff --git a/tests/wait-block/save-image/Earthfile b/tests/wait-block/save-image/Earthfile index a8137e857c..0e410662a9 100644 --- a/tests/wait-block/save-image/Earthfile +++ b/tests/wait-block/save-image/Earthfile @@ -26,7 +26,7 @@ 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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 ARG --required REGISTRY ARG --required tag WITH DOCKER --pull $REGISTRY/myuser/myimg:$tag @@ -34,7 +34,7 @@ check-with-docker-pull-works: END check-with-docker-load-works: - FROM earthly/dind:alpine-3.19-docker-25.0.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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 index 74c663c514..b5ae74195c 100644 --- 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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 ARG --required REGISTRY ARG --required tag WAIT diff --git a/tests/with-docker-cache/Earthfile b/tests/with-docker-cache/Earthfile index cb3c7c6803..68dd389dae 100644 --- a/tests/with-docker-cache/Earthfile +++ b/tests/with-docker-cache/Earthfile @@ -6,7 +6,7 @@ img: SAVE IMAGE img debug-dind: - FROM earthly/dind:alpine-3.19-docker-25.0.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 RUN mkdir /etc/docker && echo '{"debug": true}' > /etc/docker/daemon.json wd: diff --git a/tests/with-docker-compose/Earthfile b/tests/with-docker-compose/Earthfile index 4c82830832..d22051927e 100644 --- a/tests/with-docker-compose/Earthfile +++ b/tests/with-docker-compose/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -ARG DIND_IMAGE=earthly/dind:alpine-3.19-docker-25.0.5-r0 +ARG DIND_IMAGE=earthly/dind:alpine-3.20-docker-26.1.3-r2 FROM $DIND_IMAGE WORKDIR /test diff --git a/tests/with-docker-expose/Earthfile b/tests/with-docker-expose/Earthfile index f3bcf2d298..400f04e886 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 all: BUILD +test-single diff --git a/tests/with-docker-kind/Earthfile b/tests/with-docker-kind/Earthfile index ec887be085..c288c3b106 100644 --- a/tests/with-docker-kind/Earthfile +++ b/tests/with-docker-kind/Earthfile @@ -7,7 +7,7 @@ all: BUILD +ubuntu-kind alpine-kind: - ARG DIND_IMAGE=earthly/dind:alpine-3.19-docker-25.0.5-r0 + ARG DIND_IMAGE=earthly/dind:alpine-3.20-docker-26.1.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 diff --git a/tests/with-docker-registry/Earthfile b/tests/with-docker-registry/Earthfile index 14dad4ef74..376ad13171 100644 --- 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.5-r0 +FROM earthly/dind:alpine-3.20-docker-26.1.3-r2 all: BUILD +empty-test diff --git a/tests/with-docker-via-command/Earthfile b/tests/with-docker-via-command/Earthfile index 3691109d75..8f653795e6 100644 --- 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.5-r0 + FROM earthly/dind:alpine-3.20-docker-26.1.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 index 73be4e77fb..76ba64faa5 100644 --- 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.19-docker-25.0.5-r0 +ARG --global DIND_IMAGE=earthly/dind:alpine-3.20-docker-26.1.3-r2 FROM $DIND_IMAGE all: