Merge 3b7907f2d3 into 07944f9e76
commit
34810036a1
2
Makefile
2
Makefile
|
|
@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
|
||||||
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
|
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
|
||||||
|
|
||||||
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
|
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
|
||||||
ISO_VERSION ?= v1.37.0-1762018871-21834
|
ISO_VERSION ?= v1.37.0-1762954706-21886
|
||||||
|
|
||||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||||
|
|
|
||||||
|
|
@ -17,3 +17,4 @@ sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.1
|
||||||
sha256 f37ae4936832a4bde31d50028307e83bcc7af80f2d36779f4ac7c79cdfe682b0 crun-1.19.tar.gz
|
sha256 f37ae4936832a4bde31d50028307e83bcc7af80f2d36779f4ac7c79cdfe682b0 crun-1.19.tar.gz
|
||||||
sha256 cc80e3079daffb740d5f586b4a0269567c0961bc8321487fe7a3c2f13a178866 crun-1.23.tar.gz
|
sha256 cc80e3079daffb740d5f586b4a0269567c0961bc8321487fe7a3c2f13a178866 crun-1.23.tar.gz
|
||||||
sha256 d752b7cee413d2cb9463cb6995fd50801a0a1574507ebfb550ea9f26d07743f8 crun-1.23.1.tar.gz
|
sha256 d752b7cee413d2cb9463cb6995fd50801a0a1574507ebfb550ea9f26d07743f8 crun-1.23.1.tar.gz
|
||||||
|
sha256 597c211270d8cfc6ae6c184cf1a68fc5e76f1170fa28de4b19a7d3294bddd4c3 crun-1.25.tar.gz
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
CRUN_LATEST_VERSION = 1.23.1
|
CRUN_LATEST_VERSION = 1.25
|
||||||
CRUN_LATEST_COMMIT = d20b23dba05e822b93b82f2f34fd5dada433e0c2
|
CRUN_LATEST_COMMIT = d9a0adce065c7747ab88ea6ccc42b15a626e08e1
|
||||||
# need the pre-generated release tarball with the git submodules and configure
|
# need the pre-generated release tarball with the git submodules and configure
|
||||||
CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION)
|
CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION)
|
||||||
CRUN_LATEST_LICENSE = GPL-2.0
|
CRUN_LATEST_LICENSE = GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ const fileScheme = "file"
|
||||||
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
|
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
|
||||||
func DefaultISOURLs() []string {
|
func DefaultISOURLs() []string {
|
||||||
v := version.GetISOVersion()
|
v := version.GetISOVersion()
|
||||||
isoBucket := "minikube-builds/iso/21834"
|
isoBucket := "minikube-builds/iso/21886"
|
||||||
|
|
||||||
return []string{
|
return []string{
|
||||||
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
|
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue