Skip to content

Commit

Permalink
Add --pass-args to +all-dind (#3518)
Browse files Browse the repository at this point in the history
The `INCLUDE_TARGET_TAG_DOCKER` was not being picked up by `--all-dind`.
  • Loading branch information
mikejholly authored Nov 21, 2023
1 parent 6c40169 commit efe4f8d
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -638,27 +638,30 @@ all-buildkitd:
./buildkitd+buildkitd --BUILDKIT_PROJECT="$BUILDKIT_PROJECT"

dind-alpine:
DO +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=alpine --OS_VERSION=3.18 --DOCKER_VERSION=23.0.6-r7
DO --pass-args +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=alpine --OS_VERSION=3.18 --DOCKER_VERSION=23.0.6-r7

dind-ubuntu-20.04:
DO +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=ubuntu --OS_VERSION=20.04 --DOCKER_VERSION=5:24.0.5-1~ubuntu.20.04~focal
DO --pass-args +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=ubuntu --OS_VERSION=20.04 --DOCKER_VERSION=5:24.0.5-1~ubuntu.20.04~focal

dind-ubuntu-23.04:
DO +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=ubuntu --OS_VERSION=23.04 --DOCKER_VERSION=5:24.0.5-1~ubuntu.23.04~lunar
DO --pass-args +BUILD_AND_FROM --TARGET=dind --OS_IMAGE=ubuntu --OS_VERSION=23.04 --DOCKER_VERSION=5:24.0.5-1~ubuntu.23.04~lunar

# all-dind builds alpine and ubuntu dind containers for both linux amd64 and linux arm64
all-dind:
RUN --no-cache date --utc +%Y%m%d%H%M%S > datetime
ARG DATETIME="$(cat datetime)"
BUILD \
--pass-args \
--platform=linux/amd64 \
--platform=linux/arm64 \
+dind-alpine --DATETIME=$DATETIME
BUILD \
--pass-args \
--platform=linux/amd64 \
--platform=linux/arm64 \
+dind-ubuntu-20.04 --DATETIME=$DATETIME
BUILD \
--pass-args \
--platform=linux/amd64 \
--platform=linux/arm64 \
+dind-ubuntu-23.04 --DATETIME=$DATETIME
Expand Down

0 comments on commit efe4f8d

Please sign in to comment.