1
- .PHONY : docker.build docker.test docker. pkg
1
+ .PHONY : docker.build docker.pkg
2
2
3
3
SHARD =0
4
4
SHARDS =1
@@ -12,7 +12,6 @@ images:=$(if $(TRAVIS_COMMIT_RANGE),$(shell git diff --name-only $(TRAVIS_COMMIT
12
12
images: =$(shell echo "$(all_images ) $(images ) " | tr " " "\n" | sort | uniq -d)
13
13
14
14
docker_build =docker.build.
15
- docker_test =docker.test.
16
15
docker_pkg =docker.pkg.
17
16
docker_push =docker.push.
18
17
@@ -26,12 +25,10 @@ docker.help:
26
25
@echo ' $(docker_pull)$$image pull $$image from dockerhub'
27
26
@echo ' '
28
27
@echo ' $(docker_build)$$container build $$container'
29
- @echo ' $(docker_test)$$container test that $$container will build'
30
28
@echo ' $(docker_pkg)$$container package $$container for a push to dockerhub'
31
29
@echo ' $(docker_push)$$container push $$container to dockerhub '
32
30
@echo ' '
33
31
@echo ' docker.build build all defined docker containers (based on dockerhub base images)'
34
- @echo ' docker.test test all defined docker containers'
35
32
@echo ' docker.pkg package all defined docker containers (using local base images)'
36
33
@echo ' docker.push push all defined docker containers'
37
34
@echo ' '
@@ -44,19 +41,14 @@ docker_pull=docker.pull/
44
41
45
42
build : docker.build
46
43
47
- test : docker.test
48
-
49
44
pkg : docker.pkg
50
45
51
46
clean : docker.clean
52
47
53
48
docker.clean :
54
49
rm -rf .build
55
50
56
- docker.test.shard : $(foreach image,$(shell echo $(images ) | python util/balancecontainers.py $(SHARDS ) | awk 'NR% $(SHARDS ) ==$(SHARD ) ') ,$(docker_test )$(image ) )
57
-
58
51
docker.build : $(foreach image,$(images ) ,$(docker_build )$(image ) )
59
- docker.test : $(foreach image,$(images ) ,$(docker_test )$(image ) )
60
52
docker.pkg : $(foreach image,$(images ) ,$(docker_pkg )$(image ) )
61
53
docker.push : $(foreach image,$(images ) ,$(docker_push )$(image ) )
62
54
@@ -66,9 +58,6 @@ $(docker_pull)%:
66
58
$(docker_build ) % : docker/build/% /Dockerfile
67
59
docker build -f $< .
68
60
69
- $(docker_test ) % : .build/% /Dockerfile.test
70
- docker build -t $* :test -f $< .
71
-
72
61
$(docker_pkg ) % : .build/% /Dockerfile.pkg
73
62
docker build -t $* :latest -f $< .
74
63
@@ -88,21 +77,13 @@ $(docker_push)%: $(docker_pkg)%
88
77
@echo $(EDXOPS_FROM )
89
78
@echo " $( docker_build) $* : $( docker_pull) $( FROM) " > $@
90
79
@if [ " $( EDXOPS_FROM) " != " $( FROM) " ]; then \
91
- echo " $( docker_test) $* : $( docker_test) $( EDXOPS_FROM:@%=) " >> $@ ; \
92
80
echo " $( docker_pkg) $* : $( docker_pkg) $( EDXOPS_FROM:@%=) " >> $@ ; \
93
81
else \
94
- echo " $( docker_test) $* : $( docker_pull) $( FROM) " >> $@ ; \
95
82
echo " $( docker_pkg) $* : $( docker_pull) $( FROM) " >> $@ ; \
96
83
fi
97
84
98
- .build/% /Dockerfile.test : docker/build/% /Dockerfile Makefile
99
- @mkdir -p .build/$*
100
- @# perl p (print the line) n (loop over every line) e (exec the regex), like sed but cross platform
101
- @perl -pne " s#FROM edxops/([^:]+)(:\S*)?#FROM \1:test#" $< > $@
102
-
103
85
.build/% /Dockerfile.pkg : docker/build/% /Dockerfile Makefile
104
86
@mkdir -p .build/$*
105
87
@# perl p (print the line) n (loop over every line) e (exec the regex), like sed but cross platform
106
- @perl -pne " s#FROM edxops/([^:]+)(:\S*)?#FROM \1:test#" $< > $@
107
88
108
89
-include $(foreach image,$(images ) ,.build/$(image ) /Dockerfile.d)
0 commit comments