Skip to content

Commit f2ac455

Browse files
committed
reorg files
1 parent b982154 commit f2ac455

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ DIST ?= fedora
55
WORKDIR=/mnt/$$(basename $$(pwd))
66
ORG=hdgigante
77
REPO=python-opencv
8+
TARGET_REPO=$(ORG)/$(REPO)
9+
TARGET_IMAGE=$(TARGET_REPO):$(CV)-$(DIST)
810

911
run: build test login push
1012

1113
build:
12-
docker build --build-arg OPENCV_VERSION=$(CV) -t $(ORG)/$(REPO):$(CV)-$(DIST) ./$(DIST)
14+
@docker build . --build-arg OPENCV_VERSION=$(CV) -t $(TARGET_IMAGE) -f Dockerfile.$(DIST)
1315

1416
push:
15-
@docker push $(ORG)/$(REPO):$(CV)-$(DIST)
17+
@docker push $(TARGET_IMAGE)
1618

1719
latest:
18-
@docker pull $(ORG)/$(REPO):$(CV)-$(DIST)
19-
@docker tag $(ORG)/$(REPO):$(CV)-$(DIST) $(ORG)/$(REPO):latest
20-
@docker push $(ORG)/$(REPO):latest
20+
@docker pull $(TARGET_IMAGE)
21+
@docker tag $(TARGET_IMAGE) $(TARGET_REPO):latest
22+
@docker push $(TARGET_REPO):latest
2123

2224
test:
23-
@docker run --rm -v $$(pwd):$(WORKDIR) -w $(WORKDIR) $(ORG)/$(REPO):$(CV)-$(DIST) python3 test.py
25+
@docker run --rm -v $$(pwd):$(WORKDIR) -w $(WORKDIR) $(TARGET_IMAGE) python3 test.py
2426

2527
save:
26-
@docker save $(ORG)/$(REPO):$(CV)-$(DIST) | gzip > $(ORG)_$(REPO)_$(CV)-$(DIST).tar.gz
28+
@docker save $(TARGET_IMAGE) | gzip > $(ORG)_$(REPO)_$(CV)-$(DIST).tar.gz

0 commit comments

Comments
 (0)