Conversation
Switch the file-level base and the targets that consumed $ALPINE_IMG (build-provider-images, install-k8s, download-sbctl, third-party) to use the existing +ubuntu target, which already handles the FIPS variant. Rename the BASE_ALPINE UDC to BASE_UBUNTU; its body (update-ca-certificates) is portable between distros. Add apt-get installs for packages the Alpine image had baked in: - build-provider-images: jq (used to read k8s_version.json) - download-sbctl: curl ca-certificates (used to fetch sbctl tarball) - third-party: upx-ucl (used by the UPX UDC) The +alpine / +alpine-all publish targets, earthly/dind:alpine, and golang:*-alpine remain unchanged — they are external/upstream and outside the scope of this switch. Validated with `earthly ls` (all 40 targets resolve).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Switches the internal Earthfile targets that previously consumed
$ALPINE_IMGto use the existing+ubuntutarget. The published+alpine/+alpine-alltargets,earthly/dind:alpine-*, andgolang:*-alpineare intentionally left unchanged — they are external/upstream.Changes
Targets switched to
+ubuntu(which already handles the FIPS variant via$SPECTRO_PUB_REPO/third-party/ubuntu-fips:22.04):FROMat top of Earthfile)build-provider-imagesinstall-k8sdownload-sbctlthird-partyUDC renamed:
BASE_ALPINE→BASE_UBUNTU(definition + 2 callers). Body unchanged —update-ca-certificatesis portable.Package installs added (Ubuntu base does not include what Alpine had baked in):
build-provider-images:jq(used to parsek8s_version.json)download-sbctl:curl ca-certificates(used to fetch sbctl tarball)third-party:upx-ucl(used by theUPXUDC)Out of scope (deliberately not touched):
+alpine/+alpine-all— still publishesgcr.io/spectro-dev-public/canvos/alpine:$ALPINE_TAG; external consumers may depend on it.earthly/dind:alpine-3.19-docker-25.0.5-r0(cloud-image, aws-cloud-image) — upstream Earthly DinD runtime.$SPECTRO_PUB_REPO/third-party/golang:${GOLANG_VERSION}-alpine(go-deps) — upstream Go build image.Validation
earthly lsparses the Earthfile cleanly; all 40 targets resolve.Test plan
+build-provider-imagesacross all k8s distributions.+install-k8s,+download-sbctl,+third-party.FIPS_ENABLED=true) —+ubuntupicks theubuntu-fips:22.04variant.gcr.io/spectro-dev-public/canvos/alpine:$ALPINE_TAGis still produced by+alpine-all.