Skip to content

build: fixes for make build and make publish after migrating to imagelight.mk #32

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

Merged
jbw976 merged 2 commits into from
Sep 10, 2025
+27 −13
Merged

build: fixes for make build and make publish after migrating to imagelight.mk #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4c8c9
build: fixes for make build and make publish after migrating to image…
jbw976 Sep 8, 2025
270674e
build: update OS base image to latest distroless/static-debian12
jbw976 Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,4 @@ jobs:

- name: Push Latest
if: env.DOCKER_USR != ''
run: ./crossplane xpkg push -f conformance.xpkg index.docker.io/crossplane/conformance-testdata-configuration
run: ./crossplane xpkg push -f conformance.xpkg index.docker.io/crossplane/conformance-testdata-configuration:latest

@negz negz Sep 10, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work? 🤔 I didn't think you could tag a package as latest.

@jbw976 jbw976 Sep 10, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does indeed appear to work ✅

Using the same commands from ci.yml to my own jbw976 org:

crossplane xpkg build -f testdata/configuration -o conformance.xpkg
crossplane xpkg push -f conformance.xpkg index.docker.io/jbw976/conformance-testdata-configuration:latest

Looks successful with the latest tag existing on https://hub.docker.com/repository/docker/jbw976/conformance-testdata-configuration/tags/latest/sha256-9451b504ec1485dcea1d526b7b69fd0550f8579b042a2a1f004d3419ca90debf

and a docker pull works OK too:

docker pull index.docker.io/jbw976/conformance-testdata-configuration:latest
latest: Pulling from jbw976/conformance-testdata-configuration
5626454dae94: Pull complete
Digest: sha256:9451b504ec1485dcea1d526b7b69fd0550f8579b042a2a1f004d3419ca90debf
Status: Downloaded newer image for jbw976/conformance-testdata-configuration:latest
docker.io/jbw976/conformance-testdata-configuration:latest

4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ GOLANGCILINT_VERSION = 2.2.2
-include build/makelib/golang.mk

# Setup Images
DOCKER_REGISTRY = crossplane
REGISTRY_ORGS ?= docker.io/crossplane
IMAGES = conformance
OSBASEIMAGE = gcr.io/distroless/static:nonroot
OSBASEIMAGE = gcr.io/distroless/static-debian12:nonroot
-include build/makelib/imagelight.mk

fallthrough: submodules
Expand Down
34 changes: 24 additions & 10 deletions cluster/images/conformance/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,39 @@ include ../../../build/makelib/common.mk

IMAGE = $(BUILD_REGISTRY)/conformance-$(ARCH)

# Note that this is actually the 'debug' variant of the static image, which
# includes a busybox shell with just enough functionality to turn regular old
# Go test output into the gzipped tarball of junit XML that Sonobuoy craves.
OSBASEIMAGE = gcr.io/distroless/static@sha256:aea3063d00e3969d57cc8903709b58c8ee813576fbba56a977eeb915515e4ff0
# Note that this is actually the 'debug-nonroot' variant of the static-debian12
# image, which includes a busybox shell with just enough functionality to turn
# regular old Go test output into the gzipped tarball of junit XML that Sonobuoy
# craves.
OSBASEIMAGE = gcr.io/distroless/static-debian12@sha256:f556e84ce8fb32fdd5a4478550b720330a22f13ff52dab68d7a7bb3a4266829d
include ../../../build/makelib/imagelight.mk

ifeq ($(PLATFORM),$(filter $(PLATFORM),darwin_amd64 windows_amd64))
ifeq ($(PLATFORM),$(filter $(PLATFORM),darwin_amd64 darwin_arm64 windows_amd64))
$(info Skipping image build for $(PLATFORM))
img.build:
else
img.build:
@$(INFO) docker build $(IMAGE)
@$(MAKE) BUILD_ARGS="--load" img.build.shared
@$(OK) docker build $(IMAGE)
endif

ifeq ($(PLATFORM),$(filter $(PLATFORM),darwin_amd64 darwin_arm64 windows_amd64))
$(info Skipping image publish for $(PLATFORM))
img.publish:
else
img.publish:
@$(INFO) docker publish $(IMAGE)
@$(MAKE) BUILD_ARGS="--push" img.build.shared

@jbw976 jbw976 Sep 8, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i got this pattern from https://github.com/crossplane-contrib/provider-jet-vault/blob/4d68ac146c3311a1367e5d98b60be17da29f19f4/cluster/images/provider-jet-vault-controller/Makefile#L21, which I think is at a similar "era" of build processes as this repo 😂

@$(OK) docker publish $(IMAGE)
endif

img.build.shared:
@cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL)
@cp $(OUTPUT_DIR)/tests/$(OS)_$(ARCH)/tests $(IMAGE_TEMP_DIR)/conformance || $(FAIL)
@cp $(OUTPUT_DIR)/tests/linux_$(ARCH)/tests $(IMAGE_TEMP_DIR)/conformance || $(FAIL)
@cp ../../../run.sh $(IMAGE_TEMP_DIR) || $(FAIL)
@cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL)
@docker build $(BUILD_ARGS) \
@docker buildx build $(BUILD_ARGS) \
--platform linux/$(ARCH) \
-t $(IMAGE) \
$(IMAGE_TEMP_DIR) || $(FAIL)
@$(OK) docker build $(IMAGE)
endif
$(IMAGE_TEMP_DIR) || $(FAIL)
Loading