- cleaned up multiple layers
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
# Variables
|
||||
ROOT_DIR := $(PWD)
|
||||
RPMS_DIR := $(ROOT_DIR)/rpms
|
||||
NFPM_VERSION := 2.41.1
|
||||
|
||||
# Automatically find all package/version directories
|
||||
PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||")
|
||||
@@ -29,7 +28,6 @@ build:
|
||||
export PACKAGE_RELEASE=$$(cat $(PACKAGE_VERSION)/release) && \
|
||||
echo "Using PACKAGE_RELEASE=$${PACKAGE_RELEASE}" && \
|
||||
docker build \
|
||||
--build-arg NFPM_VERSION=$(NFPM_VERSION) \
|
||||
--build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \
|
||||
--build-arg PACKAGE_RELEASE=$${PACKAGE_RELEASE} \
|
||||
-t $$(echo $(PACKAGE_NAME)-builder \
|
||||
|
||||
Reference in New Issue
Block a user