Skip to content

Commit 15e874c

Browse files
authored
feat: update container image references to OCI format (#378)
1 parent d34786b commit 15e874c

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
--set "disable_http_server=true" --set "disable_netboot=true" --set "state_dir=/output" \
170170
--set "disk.efi=true" \
171171
--set "disk.size=16000" \
172-
--set "container_image=quay.io/kairos/ubuntu:24.04-core-amd64-generic-v3.2.3"
172+
--set "container_image=oci://quay.io/kairos/ubuntu:24.04-core-amd64-generic-v3.2.3"
173173
- name: Test raw image is bootable
174174
env:
175175
KVM: true
@@ -205,7 +205,7 @@ jobs:
205205
--set "disable_http_server=true" --set "disable_netboot=true" --set "state_dir=/output" \
206206
--set "disk.bios=true" \
207207
--set "disk.size=16000" \
208-
--set "container_image=quay.io/kairos/ubuntu:24.04-core-amd64-generic-v3.2.3"
208+
--set "container_image=oci://quay.io/kairos/ubuntu:24.04-core-amd64-generic-v3.2.3"
209209
- name: Test raw image is bootable
210210
env:
211211
KVM: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ This command will:
8989
Auroraboot can also boostrap nodes by using custom container images or [the official kairos releases](https://kairos.io/docs/reference/image_matrix/), for instance:
9090

9191
```
92-
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=docker://quay.io/kairos/rockylinux:9-core-amd64-generic-v2.4.2
92+
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=oci://quay.io/kairos/rockylinux:9-core-amd64-generic-v2.4.2
9393
```
9494

9595
This command will:

e2e/disks_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ stages:
9898
out, err := aurora.Run("--debug",
9999
"--set", "disable_http_server=true",
100100
"--set", "disable_netboot=true",
101-
"--set", "container_image=docker://"+image,
101+
"--set", "container_image=oci://"+image,
102102
"--set", "state_dir=/tmp/auroraboot",
103103
"--set", "disk.efi=true",
104104
"--cloud-config", "/config.yaml",
@@ -119,7 +119,7 @@ stages:
119119
out, err := aurora.Run("--debug",
120120
"--set", "disable_http_server=true",
121121
"--set", "disable_netboot=true",
122-
"--set", "container_image=docker://"+image,
122+
"--set", "container_image=oci://"+image,
123123
"--set", "state_dir=/tmp/auroraboot",
124124
"--set", "disk.gce=true",
125125
"--cloud-config", "/config.yaml",
@@ -164,7 +164,7 @@ stages:
164164
out, err := aurora.Run("--debug",
165165
"--set", "disable_http_server=true",
166166
"--set", "disable_netboot=true",
167-
"--set", "container_image=docker://"+image,
167+
"--set", "container_image=oci://"+image,
168168
"--set", "state_dir=/tmp/auroraboot",
169169
"--set", "disk.vhd=true",
170170
"--cloud-config", "/config.yaml",
@@ -187,7 +187,7 @@ stages:
187187
out, err := aurora.Run("--debug",
188188
"--set", "disable_http_server=true",
189189
"--set", "disable_netboot=true",
190-
"--set", "container_image=docker://"+image,
190+
"--set", "container_image=oci://"+image,
191191
"--set", "state_dir=/tmp/auroraboot",
192192
"--set", "disk.bios=true",
193193
"--cloud-config", "/config.yaml",

e2e/iso_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var _ = Describe("ISO image generation", Label("iso", "e2e"), func() {
4040
Expect(err).ToNot(HaveOccurred())
4141

4242
out, err := aurora.Run("--debug",
43-
"--set", fmt.Sprintf("container_image=docker://%s", image),
43+
"--set", fmt.Sprintf("container_image=oci://%s", image),
4444
"--set", "disable_http_server=true",
4545
"--set", "disable_netboot=true",
4646
"--set", "state_dir=/tmp/auroraboot",
@@ -61,7 +61,7 @@ var _ = Describe("ISO image generation", Label("iso", "e2e"), func() {
6161
Expect(err).ToNot(HaveOccurred())
6262

6363
out, err := aurora.Run(
64-
"--set", fmt.Sprintf("container_image=docker://%s", image),
64+
"--set", fmt.Sprintf("container_image=oci://%s", image),
6565
"--set", "disable_http_server=true",
6666
"--set", "disable_netboot=true",
6767
"--cloud-config", "/config.yaml")

examples/airgap/build_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ docker run -v $PWD/config.yaml:/config.yaml \
2222
--rm -ti quay.io/kairos/auroraboot:v0.2.0 \
2323
--set "disable_http_server=true" \
2424
--set "disable_netboot=true" \
25-
--set "container_image=docker://$IMAGE" \
25+
--set "container_image=oci://$IMAGE" \
2626
--set "iso.data=/tmp/data" \
2727
--cloud-config /config.yaml \
2828
--set "state_dir=/tmp/auroraboot"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kairos-io/AuroraBoot
22

3-
go 1.25.0
3+
go 1.25.3
44

55
// https://github.com/golang/go/blob/583d750fa119d504686c737be6a898994b674b69/src/crypto/x509/parser.go#L1014-L1018
66
// For keys with negative serial number:

internal/worker/worker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ func runBashProcessWithOutput(ws io.Writer, command string) error {
487487

488488
func buildRawDisk(containerImage, outputDir string, writer io.Writer, cloudConfigContent string) error {
489489
artifact := schema.ReleaseArtifact{
490-
ContainerImage: fmt.Sprintf("docker://%s", containerImage),
490+
ContainerImage: fmt.Sprintf("oci://%s", containerImage),
491491
}
492492

493493
config := schema.Config{
@@ -522,7 +522,7 @@ func buildRawDisk(containerImage, outputDir string, writer io.Writer, cloudConfi
522522

523523
func buildISO(containerImage, outputDir, artifactName string, writer io.Writer, cloudConfigContent string) error {
524524
artifact := schema.ReleaseArtifact{
525-
ContainerImage: fmt.Sprintf("docker://%s", containerImage),
525+
ContainerImage: fmt.Sprintf("oci://%s", containerImage),
526526
}
527527

528528
config, _, err := config.ReadConfig("", "", nil)

pkg/schema/artifact_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = Describe("Artifact", func() {
3030

3131
Context("when the container_image is set", func() {
3232
It("should return an empty string", func() {
33-
artifact.ContainerImage = "docker://quay.io/kairos/core-rockylinux:latest"
33+
artifact.ContainerImage = "oci://quay.io/kairos/core-rockylinux:latest"
3434
Expect(artifact.FileName()).To(Equal(""))
3535
})
3636
})

0 commit comments

Comments
 (0)