opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 11:08:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24163 from slp/update-krunkit-0.1.3

Browse Source 
Bump bundled krunkit to 0.1.3
This commit is contained in:
openshift-merge-bot[bot]
2024-10-08 17:35:19 +00:00
committed by GitHub
parent 07da6313c4 3cedd0c2b5
commit a4e098ae79
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pkginstaller/Makefile
View File

@@ -8,7 +8,7 @@ else
endif endif
GVPROXY_VERSION ?= 0.7.5 GVPROXY_VERSION ?= 0.7.5
VFKIT_VERSION ?= 0.5.1 VFKIT_VERSION ?= 0.5.1
KRUNKIT_VERSION ?= 0.1.2 KRUNKIT_VERSION ?= 0.1.3
GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin
VFKIT_RELEASE_URL ?= https://github.com/crc-org/vfkit/releases/download/v$(VFKIT_VERSION)/vfkit-unsigned VFKIT_RELEASE_URL ?= https://github.com/crc-org/vfkit/releases/download/v$(VFKIT_VERSION)/vfkit-unsigned
KRUNKIT_RELEASE_URL ?= https://github.com/containers/krunkit/releases/download/v$(KRUNKIT_VERSION)/krunkit-podman-unsigned-$(KRUNKIT_VERSION).tgz KRUNKIT_RELEASE_URL ?= https://github.com/containers/krunkit/releases/download/v$(KRUNKIT_VERSION)/krunkit-podman-unsigned-$(KRUNKIT_VERSION).tgz

3
pkg/machine/e2e/basic_test.go
View File

@@ -60,8 +60,6 @@ var _ = Describe("run basic podman commands", func() {
}) })
It("Volume ops", func() { It("Volume ops", func() {
skipIfVmtype(define.LibKrun, "FIXME: #23296 - Fails on MacOS when libkrun in use.")
tDir, err := filepath.Abs(GinkgoT().TempDir()) tDir, err := filepath.Abs(GinkgoT().TempDir())
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
roFile := filepath.Join(tDir, "attr-test-file") roFile := filepath.Join(tDir, "attr-test-file")
@@ -219,7 +217,6 @@ var _ = Describe("run basic podman commands", func() {
It("podman build contexts", func() { It("podman build contexts", func() {
skipIfVmtype(define.HyperVVirt, "FIXME: #23429 - Error running podman build with option --build-context on Hyper-V") skipIfVmtype(define.HyperVVirt, "FIXME: #23429 - Error running podman build with option --build-context on Hyper-V")
skipIfVmtype(define.QemuVirt, "FIXME: #23433 - Additional build contexts should be sent as additional tar files") skipIfVmtype(define.QemuVirt, "FIXME: #23433 - Additional build contexts should be sent as additional tar files")
skipIfVmtype(define.LibKrun, "FIXME: #23296 - Fails on MacOS when libkrun in use.")
name := randomString() name := randomString()
i := new(initMachine) i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run() session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run()