mirror of https://github.com/containers/podman.git
chore: use another script to get the version of gvproxy
Signed-off-by: Florent Benoit <fbenoit@redhat.com>
This commit is contained in:
parent
a3e132055d
commit
75aec675d2
2
Makefile
2
Makefile
|
@ -218,7 +218,7 @@ endif
|
||||||
|
|
||||||
# gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads
|
# gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads
|
||||||
# the upstream project ships pre-built binaries since version 0.7.1
|
# the upstream project ships pre-built binaries since version 0.7.1
|
||||||
GVPROXY_VERSION=$(shell grep github.com/containers/gvisor-tap-vsock go.mod | cut -d" " -f2)
|
GVPROXY_VERSION=$(shell $(GO) list -m -f '{{.Version}}' github.com/containers/gvisor-tap-vsock)
|
||||||
|
|
||||||
###
|
###
|
||||||
### Primary entry-point targets
|
### Primary entry-point targets
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
SHELL := bash
|
SHELL := bash
|
||||||
|
GO ?= go
|
||||||
|
|
||||||
ARCH ?= aarch64
|
ARCH ?= aarch64
|
||||||
ifeq ($(ARCH), aarch64)
|
ifeq ($(ARCH), aarch64)
|
||||||
|
@ -6,10 +7,10 @@ ifeq ($(ARCH), aarch64)
|
||||||
else
|
else
|
||||||
GOARCH:=$(ARCH)
|
GOARCH:=$(ARCH)
|
||||||
endif
|
endif
|
||||||
GVPROXY_VERSION ?= $(shell grep github.com/containers/gvisor-tap-vsock ../../go.mod | cut -d" " -f2)
|
GVPROXY_VERSION=$(shell $(GO) list -m -f '{{.Version}}' github.com/containers/gvisor-tap-vsock)
|
||||||
VFKIT_VERSION ?= 0.6.1
|
VFKIT_VERSION ?= 0.6.1
|
||||||
KRUNKIT_VERSION ?= 0.2.0
|
KRUNKIT_VERSION ?= 0.2.0
|
||||||
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/$(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
|
||||||
PACKAGE_DIR ?= out/packaging
|
PACKAGE_DIR ?= out/packaging
|
||||||
|
|
Loading…
Reference in New Issue