Skip to content

Commit

Permalink
update bootkit version
Browse files Browse the repository at this point in the history
To one which has this version of mosctl, so that boot knows
about the new storage config.

Signed-off-by: Serge Hallyn <[email protected]>
  • Loading branch information
hallyn committed Dec 25, 2023
1 parent b14e85e commit 6212ce3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
dir: 'layers'
build-args: |
ZOT_VERSION=2.0.0-rc5
ROOTFS_VERSION=v0.0.18.231121
ROOTFS_VERSION=v0.0.19.231225
TOPDIR=${{ env.TOPDIR }}
url: docker://zothub.io/machine/bootkit
layer-type: squashfs
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ORAS_VERSION := 1.0.0-rc.1
REGCTL := $(TOOLSDIR)/bin/regctl
REGCTL_VERSION := 0.5.0
TOPDIR := $(shell git rev-parse --show-toplevel)
BOOTKIT_VERSION ?= "v0.0.18.231121"
BOOTKIT_VERSION ?= "v0.0.19.231225"
ROOTFS_VERSION = $(BOOTKIT_VERSION)

archout = $(shell arch)
Expand Down
4 changes: 2 additions & 2 deletions docs/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ in the file 'stacker.yaml'):

```
stacker build --layer-type=squashfs \
--substitute ROOTFS_VERSION=v0.0.18.231121 \
--substitute ROOTFS_VERSION=v0.0.19.231225 \
--substitute ZOT_VERSION=2.0.0-rc5
```

Expand Down Expand Up @@ -340,7 +340,7 @@ jq . < blobs/sha256/50a93be19bf1027b8363554359e288890324fa7e21002df072e50955e833
},
{
"service_name": "hostfs",
"version": "v0.0.18.231121",
"version": "v0.0.19.231225",
"service_type": "hostfs",
"network": {
"type": "host",
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function trust_setup {
function common_setup {
trust_setup

export ROOTFS_VERSION="${ROOTFS_VERSION:-v0.0.18.231121}"
export ROOTFS_VERSION="${ROOTFS_VERSION:-v0.0.19.231225}"
echo "ROOTFS_VERSION is ${ROOTFS_VERSION}"

if [ ! -d "${PWD}/zothub" ]; then
Expand Down

0 comments on commit 6212ce3

Please sign in to comment.