From 5b98d87e523bd5180f0b3caf655c779ed83f686a Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 5 May 2023 17:20:06 -0700 Subject: Docker: Makefile housekeeping. --- pkg/docker/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkg') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 41c22171..bf5fe061 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -8,8 +8,6 @@ DEFAULT_VERSION := $(NXT_VERSION) VERSION ?= $(DEFAULT_VERSION) PATCHLEVEL ?= 1 -EXPORT_DIR := $(VERSION) - MODULES ?= go jsc node perl php python ruby VARIANT ?= bullseye @@ -70,7 +68,7 @@ INSTALL_ruby ?= ruby-install RUN_ruby ?= gem install rack default: - @echo "valid targets: all build dockerfiles clean" + @echo "valid targets: all build dockerfiles library clean" MODVERSIONS = $(foreach module, $(MODULES), $(foreach modversion, $(shell for v in $(VERSIONS_$(module)); do echo $$v; done | sort -r), $(module)$(modversion))) minimal @@ -121,7 +119,6 @@ library: all: $(addprefix Dockerfile., $(MODVERSIONS)) clean: - rm -f $(addprefix Dockerfile., $(MODVERSIONS)) - rm -rf $(EXPORT_DIR) + rm -f Dockerfile.* .PHONY: default build dockerfiles clean library -- cgit