Update dind references to r7 (#3516)

earthly · Nov 21, 2023 · ae42b03 · ae42b03
1 parent efe4f8d
commit ae42b03
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/Earthfile b/Earthfile
@@ -129,7 +129,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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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.18-docker-23.0.6-r4"
+          "earthly/dind:alpine-3.18-docker-23.0.6-r7"
         ],
         "name": "FROM"
       }
@@ -805,7 +805,7 @@
         {
           "command": {
             "args": [
-              "earthly/dind:alpine-3.18-docker-23.0.6-r4"
+              "earthly/dind:alpine-3.18-docker-23.0.6-r7"
             ],
             "name": "FROM"
           }
@@ -864,7 +864,7 @@
         {
           "command": {
             "args": [
-              "earthly/dind:alpine-3.18-docker-23.0.6-r4"
+              "earthly/dind:alpine-3.18-docker-23.0.6-r7"
             ],
             "name": "FROM"
           }
@@ -922,7 +922,7 @@
           "command": {
             "args": [
               "+cgroup-v2-test",
-              "--DIND_IMG=earthly/dind:alpine-3.18-docker-23.0.6-r4",
+              "--DIND_IMG=earthly/dind:alpine-3.18-docker-23.0.6-r7",
               "--DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.5-1"
             ],
             "name": "BUILD"

diff --git a/docs/docker-images/dind.md b/docs/docker-images/dind.md
@@ -4,7 +4,7 @@ See the ["use-earthly-dind" best-practice](https://docs.earthly.dev/best-practic
 
 ## Tags
 
-* `alpine-3.18-docker-23.0.6-r4`
+* `alpine-3.18-docker-23.0.6-r7`
 * `ubuntu-20.04-docker-24.0.5-1`
 * `ubuntu-23.04-docker-24.0.5-1`
 
@@ -27,8 +27,8 @@ dind:
   ARG EARTHLY_VERSION
   ARG SMALLEST_VERSION="$(echo -e "$EARTHLY_VERSION\nv0.7.14" | sort -V | head -n 1)"
   IF [ "$SMALLEST_VERSION" = "v0.7.14" ]
-    # earthly is at v0.7.14 or newer, and must use the more recent dind:alpine-3.18-docker-23.0.6-r4 image
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    # earthly is at v0.7.14 or newer, and must use the more recent dind:alpine-3.18-docker-23.0.6-r7 image
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
   END
 
 test:

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-23.0.6-r4"
+	suggestedDINDImage          = "earthly/dind:alpine-3.18-docker-23.0.6-r7"
 )
 
 // DockerLoadOpt holds parameters for WITH DOCKER --load parameter.

diff --git a/inputgraph/testdata/with-docker/Earthfile b/inputgraph/testdata/with-docker/Earthfile
@@ -9,21 +9,21 @@ load-target:
     SAVE IMAGE saved:latest
 
 with-docker-load:
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     WITH DOCKER --load saved:latest=+load-target
          RUN echo "loaded"
     END
 
 with-docker-load-no-alias:
     BUILD +load-target
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     WITH DOCKER --load +load-target
          RUN echo "loaded"
     END
 
 with-docker-load-args:
     BUILD +load-target
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     WITH DOCKER --load foo=(+load-target --foo=2)
          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.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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
@@ -1,6 +1,6 @@
 VERSION --use-visited-upfront-hash-collection 0.7
 
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 parallel:
   BUILD +test-executor --INDEX=1

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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     ARG --required REGISTRY
     ARG --required tag
     WAIT

diff --git a/tests/with-docker-expose/Earthfile b/tests/with-docker-expose/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 all:
     BUILD +test-single

diff --git a/tests/with-docker-kind/Earthfile b/tests/with-docker-kind/Earthfile
@@ -1,13 +1,13 @@
 VERSION 0.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 all:
     ARG KIND_VERSION=0.20.0
     BUILD +alpine-kind --KIND_VERSION=$KIND_VERSION
     BUILD +ubuntu-kind --KIND_VERSION=$KIND_VERSION
 
 alpine-kind:
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     RUN apk add curl
     ARG --required KIND_VERSION
     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
@@ -1,5 +1,5 @@
 VERSION 0.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 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.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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,5 +1,5 @@
 VERSION 0.7
-FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
 
 all:
     BUILD +empty-test
@@ -136,7 +136,7 @@ multi-from-two:
     FROM alpine:latest
 
 one-target-many-names:
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     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 \
@@ -150,7 +150,7 @@ one-target-many-names:
     END
 
 if-after:
-    FROM earthly/dind:alpine-3.18-docker-23.0.6-r4
+    FROM earthly/dind:alpine-3.18-docker-23.0.6-r7
     WITH DOCKER --load a:latest=+multi-from-one
         RUN docker run a:latest
     END
@@ -161,7 +161,7 @@ if-after:
 
 cgroup-v2-test-all:
     BUILD +cgroup-v2-test \
-        --DIND_IMG=earthly/dind:alpine-3.18-docker-23.0.6-r4 \
+        --DIND_IMG=earthly/dind:alpine-3.18-docker-23.0.6-r7 \
         --DIND_IMG=earthly/dind:ubuntu-23.04-docker-24.0.5-1
 
 cgroup-v2-test: