Skip to content

Commit f0150c4

Browse files
committed
feat: use rootless Image Factory
Pull in new Talos imager to support rootless IF. Part of: siderolabs/talos#12146 Signed-off-by: Noel Georgi <[email protected]>
1 parent f57218f commit f0150c4

File tree

11 files changed

+273
-262
lines changed

11 files changed

+273
-262
lines changed

.kres.yaml

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
- name: PKGS_PREFIX
2424
defaultValue: ghcr.io/siderolabs
2525
- name: PKGS
26-
defaultValue: v1.12.0
26+
defaultValue: v1.13.0-alpha.0-21-g59241bd
2727
docker:
2828
extraArgs:
2929
- PKGS_PREFIX
@@ -99,6 +99,10 @@ spec:
9999
toplevel: true
100100
- name: check-dirty
101101
toplevel: true
102+
- name: docker-compose-up
103+
toplevel: true
104+
- name: docker-compose-down
105+
toplevel: true
102106
---
103107
kind: custom.Step
104108
name: imager-base
@@ -417,7 +421,7 @@ spec:
417421
- docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
418422
- docker rm -f local-if || true
419423
- docker run -d -p 5100:5000 --name=local-if registry:3
420-
- docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
424+
- docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
421425
- docker rm -f local-if
422426
ghaction:
423427
enabled: true
@@ -446,7 +450,7 @@ spec:
446450
- docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
447451
- docker rm -f local-if || true
448452
- docker run -d -p 5100:5000 --name=local-if registry:3
449-
- docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-s3.txt -test.run $(RUN_TESTS)
453+
- docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-s3.txt -test.run $(RUN_TESTS)
450454
- docker rm -f local-if
451455
ghaction:
452456
enabled: true
@@ -480,7 +484,7 @@ spec:
480484
- docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
481485
- docker rm -f local-if || true
482486
- docker run -d -p 5100:5000 --name=local-if registry:3
483-
- docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-cdn.txt -test.run $(RUN_TESTS)
487+
- docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-cdn.txt -test.run $(RUN_TESTS)
484488
- docker rm -f local-if
485489
ghaction:
486490
enabled: true
@@ -514,7 +518,7 @@ spec:
514518
- docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
515519
- docker rm -f local-if || true
516520
- docker run -d -p 5100:5000 --name=local-if registry:3
517-
- docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
521+
- docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
518522
- docker rm -f local-if
519523
ghaction:
520524
enabled: true
@@ -548,7 +552,7 @@ spec:
548552
- docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
549553
- docker rm -f local-if || true
550554
- docker run -d -p 5100:5000 --name=local-if registry:3
551-
- docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.enterprise.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-enterprise.txt -test.run $(RUN_TESTS)
555+
- docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.enterprise.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-enterprise.txt -test.run $(RUN_TESTS)
552556
- docker rm -f local-if
553557
ghaction:
554558
enabled: true
@@ -640,6 +644,26 @@ spec:
640644
crons:
641645
- "30 7 * * *"
642646
---
647+
kind: custom.Step
648+
name: docker-compose-up
649+
spec:
650+
makefile:
651+
enabled: true
652+
phony: true
653+
script:
654+
- "@$(MAKE) image-image-factory PUSH=true"
655+
- "@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml up -d --remove-orphans"
656+
- "@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml logs -f image-factory"
657+
---
658+
kind: custom.Step
659+
name: docker-compose-down
660+
spec:
661+
makefile:
662+
enabled: true
663+
phony: true
664+
script:
665+
- "@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml down"
666+
---
643667
kind: common.Build
644668
spec:
645669
ignoredPaths:

Makefile

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-12-22T11:58:31Z by kres 26be706.
3+
# Generated on 2025-12-25T06:40:27Z by kres 26be706.
44

55
# common variables
66

@@ -82,7 +82,7 @@ TOOLCHAIN ?= docker.io/golang:1.25-alpine
8282
# extra variables
8383

8484
PKGS_PREFIX ?= ghcr.io/siderolabs
85-
PKGS ?= v1.12.0
85+
PKGS ?= v1.13.0-alpha.0-21-g59241bd
8686
RUN_TESTS ?= TestIntegrationCDN
8787
TEST_FLAGS ?=
8888

@@ -220,7 +220,7 @@ integration-direct: integration.test
220220
docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
221221
docker rm -f local-if || true
222222
docker run -d -p 5100:5000 --name=local-if registry:3
223-
docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
223+
docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
224224
docker rm -f local-if
225225

226226
.PHONY: integration-s3
@@ -229,7 +229,7 @@ integration-s3: integration.test
229229
docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
230230
docker rm -f local-if || true
231231
docker run -d -p 5100:5000 --name=local-if registry:3
232-
docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-s3.txt -test.run $(RUN_TESTS)
232+
docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-s3.txt -test.run $(RUN_TESTS)
233233
docker rm -f local-if
234234

235235
.PHONY: integration-cdn
@@ -238,7 +238,7 @@ integration-cdn: integration.test
238238
docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
239239
docker rm -f local-if || true
240240
docker run -d -p 5100:5000 --name=local-if registry:3
241-
docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-cdn.txt -test.run $(RUN_TESTS)
241+
docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-cdn.txt -test.run $(RUN_TESTS)
242242
docker rm -f local-if
243243

244244
.PHONY: integration-proxy-installer
@@ -247,7 +247,7 @@ integration-proxy-installer: integration.test
247247
docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
248248
docker rm -f local-if || true
249249
docker run -d -p 5100:5000 --name=local-if registry:3
250-
docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
250+
docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-direct.txt -test.run $(RUN_TESTS)
251251
docker rm -f local-if
252252

253253
.PHONY: integration-enterprise
@@ -256,7 +256,7 @@ integration-enterprise: integration.enterprise.test
256256
docker pull $(REGISTRY)/$(USERNAME)/image-factory:$(TAG)
257257
docker rm -f local-if || true
258258
docker run -d -p 5100:5000 --name=local-if registry:3
259-
docker run --rm --net=host --privileged -v /dev:/dev -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.enterprise.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-enterprise.txt -test.run $(RUN_TESTS)
259+
docker run --rm --net=host -v /var/run:/var/run -v $(PWD)/$(ARTIFACTS)/:/out/ -v $(PWD)/$(ARTIFACTS)/integration.enterprise.test:/bin/integration.test:ro --entrypoint /bin/integration.test $(REGISTRY)/$(USERNAME)/image-factory:$(TAG) -test.v $(TEST_FLAGS) -test.coverprofile=/out/coverage-integration-enterprise.txt -test.run $(RUN_TESTS)
260260
docker rm -f local-if
261261

262262
.PHONY: $(ARTIFACTS)/image-factory-linux-amd64
@@ -332,6 +332,16 @@ docs:
332332
check-dirty:
333333
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi
334334

335+
.PHONY: docker-compose-up
336+
docker-compose-up:
337+
@$(MAKE) image-image-factory PUSH=true
338+
@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml up -d --remove-orphans
339+
@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml logs -f image-factory
340+
341+
.PHONY: docker-compose-down
342+
docker-compose-down:
343+
@IMAGE_FACTORY_IMAGE=$(REGISTRY)/$(USERNAME)/image-factory:$(IMAGE_TAG) docker compose -f hack/dev/compose.yaml down
344+
335345
.PHONY: rekres
336346
rekres:
337347
@docker pull $(KRES_IMAGE)

0 commit comments

Comments
 (0)