From c5b1aa84574491f6e5f07ee1a1e5380c0c37d4f8 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Wed, 25 Sep 2019 14:26:46 -0700 Subject: [PATCH] realpath for plugins directory Signed-off-by: Zuhayr Elahi --- deb/Makefile | 3 ++- rpm/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deb/Makefile b/deb/Makefile index 315f1f31ef..2c631ac1c6 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -2,6 +2,7 @@ include ../common.mk CLI_DIR:=$(realpath $(CURDIR)/../../cli) ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) +PLUGINS_DIR:=$(realpath $(CURDIR)/../plugins) GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD) STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang @@ -114,7 +115,7 @@ sources/engine-image: sources/plugin-installers.tgz: $(wildcard ../plugins/*) docker run --rm -i -w /v \ - -v $(shell readlink -e ../plugins):/plugins \ + -v $(PLUGINS_DIR):/plugins \ -v $(CURDIR)/sources:/v \ alpine \ tar -C / -c -z -f /v/plugin-installers.tgz --exclude .git plugins diff --git a/rpm/Makefile b/rpm/Makefile index 0ca87e7afc..8c80dc7444 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -2,6 +2,7 @@ include ../common.mk CLI_DIR:=$(realpath $(CURDIR)/../../cli) ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) +PLUGINS_DIR=$(realpath $(CURDIR)/../plugins) GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang @@ -114,7 +115,7 @@ rpmbuild/SOURCES/distribution_based_engine.json: rpmbuild/SOURCES/engine-image rpmbuild/SOURCES/plugin-installers.tgz: $(wildcard ../plugins/*) docker run --rm -i -w /v \ - -v $(shell readlink -e ../plugins):/plugins \ + -v $(PLUGINS_DIR):/plugins \ -v $(CURDIR)/rpmbuild/SOURCES:/v \ alpine \ tar -C / -c -z -f /v/plugin-installers.tgz --exclude .git plugins