Skip to content

Commit 02b00f9

Browse files
committed
Docker: cleanup unused targets.
1 parent 060e683 commit 02b00f9

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

pkg/docker/Makefile

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,14 @@ INSTALL_ruby ?= ruby-install
6969
COPY_ruby = RUN gem install rack
7070

7171
default:
72-
@echo "valid targets: all build dockerfiles push tag export clean"
72+
@echo "valid targets: all build dockerfiles clean"
7373

7474
MODVERSIONS = $(foreach module,$(MODULES),$(module)$(VERSION_$(module)))
7575

7676
modname = $(shell echo $1 | /usr/bin/tr -d '.01234567890-')
7777

7878
dockerfiles: $(addprefix Dockerfile., $(MODVERSIONS))
7979
build: $(addprefix build-,$(MODVERSIONS))
80-
tag: $(addprefix tag-,$(MODVERSIONS))
81-
push: $(addprefix push-,$(MODVERSIONS))
82-
export: $(addsuffix .tar.gz,$(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODVERSIONS))) $(addsuffix .tar.gz.sha512, $(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODVERSIONS)))
8380

8481
Dockerfile.%: ../../version
8582
@echo "===> Building $@"
@@ -95,25 +92,10 @@ build-%: Dockerfile.%
9592
docker pull $(CONTAINER_$(call modname, $*))
9693
docker build --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* .
9794

98-
tag-%: build-%
99-
docker tag unit:$(VERSION)-$* nginx/unit:$(VERSION)-$*
100-
101-
push-%: tag-%
102-
docker push nginx/unit:$(VERSION)-$*
103-
104-
$(EXPORT_DIR):
105-
mkdir -p $@
106-
107-
$(EXPORT_DIR)/nginx-unit-$(VERSION)-%.tar.gz: $(EXPORT_DIR) tag-%
108-
docker save nginx/unit:$(VERSION)-$* | gzip > $@
109-
110-
$(EXPORT_DIR)/nginx-unit-$(VERSION)-%.tar.gz.sha512: $(EXPORT_DIR)/nginx-unit-$(VERSION)-%.tar.gz
111-
$(SHA512SUM) $< | sed 's,$(EXPORT_DIR)/,,' > $@
112-
11395
all: $(addprefix Dockerfile., $(MODVERSIONS))
11496

11597
clean:
11698
rm -f $(addprefix Dockerfile., $(MODVERSIONS))
11799
rm -rf $(EXPORT_DIR)
118100

119-
.PHONY: default build dockerfiles push tag export clean
101+
.PHONY: default build dockerfiles clean

0 commit comments

Comments
 (0)