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

chore(deps): update earthly/dind docker tag to alpine-3.20-docker-26.1.3-r1 (main) #4109

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(deps): update earthly/dind docker tag to alpine-3.20-docker-26.1.3-r1 (main) #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
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-r1
RUN apk add --no-cache --update bash
COPY earthly .earthly_version_flag_overrides .

Expand Down Expand Up @@ -258,7 +258,7 @@
END
ELSE IF [ "$DOCKERHUB_MIRROR_AUTH" = "true" ]
WITH DOCKER
RUN --secret DOCKERHUB_MIRROR_USER \

Check failure on line 261 in Earthfile

View workflow job for this annotation

GitHub Actions / podman-tests-quick / +testing-gha-ubuntu-latest-podman

Error 

The command WITH DOCKER RUN --privileged ./not-a-unit-test.sh did not complete successfully. Exit code 1
--secret DOCKERHUB_MIRROR_PASS \
./not-a-unit-test.sh
END
Expand Down Expand Up @@ -505,7 +505,7 @@
RUN if [ "$DOCKERHUB_MIRROR_AUTH" = "true" ]; then echo "ERROR: DOCKERHUB_MIRROR_AUTH_FROM_CLOUD_SECRETS and DOCKERHUB_MIRROR_AUTH are mutually exclusive" && exit 1; fi
RUN --secret DOCKERHUB_MIRROR_USER=dockerhub-mirror/user --secret DOCKERHUB_MIRROR_PASS=dockerhub-mirror/pass USE_EARTHLY_MIRROR=true ./setup-registry.sh
ELSE IF [ "$DOCKERHUB_MIRROR_AUTH" = "true" ]
RUN --secret DOCKERHUB_MIRROR_USER --secret DOCKERHUB_MIRROR_PASS ./setup-registry.sh

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / podman-test-registry-command-gcp / +testing-gha-ubuntu-latest-podman

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group1 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group2 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group11 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group4 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group12 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1

Check failure on line 508 in Earthfile

View workflow job for this annotation

GitHub Actions / docker-tests-no-qemu-group9 / +testing-gha-ubuntu-latest-docker

Error 

The command RUN ./setup-registry.sh did not complete successfully. Exit code 1
ELSE IF [ "$DOCKERHUB_AUTH" = "true" ]
RUN --secret DOCKERHUB_USER --secret DOCKERHUB_PASS ./setup-registry.sh
ELSE
Expand Down
2 changes: 1 addition & 1 deletion ast/tests/with-docker-compose.ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1"
],
"name": "ARG"
}
Expand Down
2 changes: 1 addition & 1 deletion ast/tests/with-docker.ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1"
],
"name": "ARG"
}
Expand Down
2 changes: 1 addition & 1 deletion earthfile2llb/with_docker_run_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.19-docker-25.0.5-r0"
suggestedDINDImage = "earthly/dind:alpine-3.20-docker-26.1.3-r1"
)

// DockerLoadOpt holds parameters for WITH DOCKER --load parameter.
Expand Down
8 changes: 4 additions & 4 deletions inputgraph/testdata/with-docker/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
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-r1
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-r1
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-r1
WITH DOCKER --load foo=github.com/earthly/earthly:6610b73131f94cbe594dba3b90665748f21a9b8d+license
RUN echo "loaded"
END
2 changes: 1 addition & 1 deletion scripts/tests/interactive-debugger/docker-compose/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

fail-with-docker-compose:
WORKDIR /test
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud-push-pull/amazon-elastic-container-registry.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

push:
ARG ACCT_ID
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud-push-pull/azure-container-registry.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

push:
RUN date | md5sum | head -c 32 > motd
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud-push-pull/google-artifact-repository.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

push:
RUN date | md5sum | head -c 32 > motd
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud-push-pull/google-container-registry.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

push:
RUN date | md5sum | head -c 32 > motd
Expand Down
2 changes: 1 addition & 1 deletion tests/ssh.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
RUN apk --update add openssh-client
WITH DOCKER
RUN --ssh test -n "$SSH_AUTH_SOCK" && ssh-add -l | grep 'rsa-key-from-earthly-tests'
Expand Down
2 changes: 1 addition & 1 deletion tests/visited-upfront-hash-collection.earth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

parallel:
BUILD +test-executor --INDEX=1
Expand Down
4 changes: 2 additions & 2 deletions tests/wait-block/save-image/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-r0
FROM earthly/dind:alpine-3.20-docker-26.1.3-r1
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.5-r0
FROM earthly/dind:alpine-3.20-docker-26.1.3-r1
WITH DOCKER --load mytestimg=+myimg
RUN docker run mytestimg /bin/sh -c 'cat /special-data' | grep NWMyMTQ2Y
END
Expand Down
2 changes: 1 addition & 1 deletion tests/wait-block/with-docker-run-load/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
ARG --required REGISTRY
ARG --required tag
WAIT
Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-cache/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
RUN mkdir /etc/docker && echo '{"debug": true}' > /etc/docker/daemon.json

wd:
Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-compose/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1
FROM $DIND_IMAGE
WORKDIR /test

Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-expose/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

all:
BUILD +test-single
Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-kind/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
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
Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-registry/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1

all:
BUILD +empty-test
Expand Down
2 changes: 1 addition & 1 deletion tests/with-docker-via-command/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-r1
DO +MY_COMMAND_WITH_DOCKER --MY_ARG="myvalue"
DO +MY_COMMAND_WITH_DOCKER
2 changes: 1 addition & 1 deletion tests/with-docker/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-r1
FROM $DIND_IMAGE

all:
Expand Down