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.

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

Update bpf-next steps in README #73

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update bpf-next steps in README #73

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
81c3412
Update bpf-next steps in README
aditighag Jul 5, 2023
003f75e
GHA: update tags
Jul 5, 2023
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $ make images
=> => writing image sha257:96a86e6ebb38238569c007491c3e86a056340ceb9e4a3e66959bfa6a6ca8f8a0
=> => naming to quay.io/lvh-images/root-images
$ c=$(docker create sha256:96a86e6ebb38238569c007491c3e86a056340ceb9e4a3e66959bfa6a6ca8f8a0)
$ docker cp $c:/data/images/base.qcow2.zst /tmp
$ docker cp $c:/data/images/kind_bpf-next.qcow2.zst /tmp
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think that's not correct. The original example is about root-images, and kind_bpf-next exists in the kind images. For the kind and complexity-test images, it might make sense to have a symbolic link always pointing to the proper file (since these only contain one image).

Copy link
Collaborator

Choose a reason for hiding this comment

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

For the README, specifically it might make sense to add an examples for kind and complexity-test images as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, missed your comments. Sure, I'll extend the README with kind images examples.

$ zstd --decompress /tmp/base.qcow2.zst
$ lvh run --host-mount $(pwd) --image /tmp/base.qcow2
```
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/complexity-test-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# syntax=docker/dockerfile:1.3-labs
# vim: set ft=dockerfile:

ARG ROOT_BUILDER_TAG=20230623.160846
ARG ROOT_IMAGES_TAG=20230620.090014
ARG ROOT_BUILDER_TAG=20230705.160505
ARG ROOT_IMAGES_TAG=20230705.160505

# override this with --build-arg
ARG KERNEL_VER=bpf-next
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/kernel-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim: set ft=dockerfile:

ARG KERNEL_BUILDER_TAG=20230623.160846
ARG KERNEL_BUILDER_TAG=20230705.160505

FROM quay.io/lvh-images/kernel-builder:"${KERNEL_BUILDER_TAG}" AS builder
ARG KERNEL_VER=bpf-next
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/kind-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# syntax=docker/dockerfile:1.3-labs
# vim: set ft=dockerfile:

ARG ROOT_BUILDER_TAG=20230623.160846
ARG ROOT_IMAGES_TAG=20230620.090014
ARG ROOT_BUILDER_TAG=20230705.160505
ARG ROOT_IMAGES_TAG=20230705.160505

# override this with --build-arg
ARG KERNEL_VER=bpf-next
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/root-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim: set ft=dockerfile:

ARG ROOT_BUILDER_TAG=20230623.160846
ARG ROOT_BUILDER_TAG=20230705.160505

FROM quay.io/lvh-images/root-builder:"${ROOT_BUILDER_TAG}" AS builder
COPY _data /data
Expand Down
14 changes: 7 additions & 7 deletions versions/complexity-test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
4.19-20230620.090014
5.4-20230620.090014
5.10-20230620.090014
5.15-20230620.090014
6.0-20230620.090014
6.3-20230620.090014
bpf-next-20230620.090014
4.19-20230705.160505
5.4-20230705.160505
5.10-20230705.160505
5.15-20230705.160505
6.0-20230705.160505
6.3-20230705.160505
bpf-next-20230705.160505
2 changes: 1 addition & 1 deletion versions/kernel-builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230623.160846
20230705.160505
14 changes: 7 additions & 7 deletions versions/kernel-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
4.19-20230620.090014
5.4-20230620.090014
5.10-20230620.090014
5.15-20230620.090014
6.0-20230620.090014
6.3-20230620.090014
bpf-next-20230620.090014
4.19-20230705.160505
5.4-20230705.160505
5.10-20230705.160505
5.15-20230705.160505
6.0-20230705.160505
6.3-20230705.160505
bpf-next-20230705.160505
14 changes: 7 additions & 7 deletions versions/kind
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
4.19-20230620.090014
5.4-20230620.090014
5.10-20230620.090014
5.15-20230620.090014
6.0-20230620.090014
6.3-20230620.090014
bpf-next-20230620.090014
4.19-20230705.160505
5.4-20230705.160505
5.10-20230705.160505
5.15-20230705.160505
6.0-20230705.160505
6.3-20230705.160505
bpf-next-20230705.160505
2 changes: 1 addition & 1 deletion versions/root-builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230623.160846
20230705.160505
2 changes: 1 addition & 1 deletion versions/root-images
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230620.090014
20230705.160505