Skip to content
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.

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

Copy over the osbuilder-tools image assets and merge with auroraboot #110

Merged
merged 10 commits into from
Nov 14, 2024

Conversation

jimmykarily
Copy link
Contributor

@jimmykarily jimmykarily commented Nov 13, 2024

So we can deprecate the osbuilder-tools image in favor of this one.

Part of kairos-io/kairos#1633

@jimmykarily jimmykarily self-assigned this Nov 13, 2024
So we can deprecate the osbuilder-tools image in favor of this one.

Part of kairos-io/kairos#1633

Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Dimitris Karakasilis <[email protected]>
@jimmykarily jimmykarily force-pushed the 1633-merge-osbuilder-tools-image branch 2 times, most recently from feb7955 to 0e345ff Compare November 13, 2024 13:13
this making the `auroraboot --version` command fail

https://docs.docker.com/build/building/variables/#scoping

Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily added a commit to kairos-io/osbuilder that referenced this pull request Nov 13, 2024
Because the tools image has been merged to the auroraboot one here:
kairos-io/AuroraBoot#110

Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily added a commit to kairos-io/osbuilder that referenced this pull request Nov 13, 2024
because it has been merged with auroraboot here:

kairos-io/AuroraBoot#110

as part of kairos-io/kairos#1633

Signed-off-by: Dimitris Karakasilis <[email protected]>
@jimmykarily jimmykarily requested a review from a team November 14, 2024 05:41
@jimmykarily jimmykarily marked this pull request as ready for review November 14, 2024 05:41
@jimmykarily jimmykarily force-pushed the 1633-merge-osbuilder-tools-image branch from 662f15a to e9104f6 Compare November 14, 2024 11:38
Dockerfile Outdated Show resolved Hide resolved
Earthfile Show resolved Hide resolved
jimmykarily added a commit to kairos-io/osbuilder that referenced this pull request Nov 14, 2024
because it has been merged with auroraboot here:

kairos-io/AuroraBoot#110

as part of kairos-io/kairos#1633

Signed-off-by: Dimitris Karakasilis <[email protected]>
Copy link
Member

@Itxaka Itxaka left a comment

Choose a reason for hiding this comment

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

Looks good, let's see what we break 😂

FROM opensuse/leap:$LEAP_VERSION AS default
RUN zypper ref && zypper dup -y
## ISO+ Arm image + Netboot + cloud images Build depedencies
RUN zypper ref && zypper in -y bc qemu qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted binutils \
Copy link
Member

Choose a reason for hiding this comment

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

can we add a TODO here to track grub artifacts here and below? We may not need some of them anymore with aurora bundling the iso cd images

it seems that it only fails when the user building is not the same as
the owner of the .git directory:

golang/go#53532

I only saw it when running:

```
docker run --rm -it -v $PWD:/work --workdir /work golang go build .
```

With `docker build` it just works (maybe that command handles the users
differently?). In any case, it doesn't affect CI or anything else so
I'll remove it.

Signed-off-by: Dimitris Karakasilis <[email protected]>
@jimmykarily jimmykarily enabled auto-merge (squash) November 14, 2024 15:51
@jimmykarily jimmykarily merged commit cc8b857 into main Nov 14, 2024
8 checks passed
@jimmykarily jimmykarily deleted the 1633-merge-osbuilder-tools-image branch November 14, 2024 15:53
jimmykarily added a commit to kairos-io/osbuilder that referenced this pull request Nov 15, 2024
* Remove references to osbuilder-tools image

because it has been merged with auroraboot here:

kairos-io/AuroraBoot#110

as part of kairos-io/kairos#1633

Signed-off-by: Dimitris Karakasilis <[email protected]>

* WIP

Signed-off-by: Dimitris Karakasilis <[email protected]>

* Fix test command

Signed-off-by: Dimitris Karakasilis <[email protected]>

* go mod tidy

Signed-off-by: Dimitris Karakasilis <[email protected]>

* Bump linting action

Signed-off-by: Dimitris Karakasilis <[email protected]>

* Don't look for artifacts in build/ subdir

because it has been fixed here:

kairos-io/AuroraBoot#115

Signed-off-by: Dimitris Karakasilis <[email protected]>

---------

Signed-off-by: Dimitris Karakasilis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants