@@ -24,10 +24,6 @@ GOPATH := $(GOBUILDDIR)
2424PULSAR := $(GOBUILDDIR ) /bin/pulsar$(shell go env GOEXE)
2525GOASSETSBUILDER := $(GOBUILDDIR ) /bin/go-assets-builder$(shell go env GOEXE)
2626
27- DOCKERFILE := Dockerfile
28- DOCKERTESTFILE := Dockerfile.test
29- DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
30-
3127HELM ?= $(shell which helm)
3228
3329.PHONY : helm
@@ -96,8 +92,6 @@ ifndef ALLOWCHAOS
9692 ALLOWCHAOS := true
9793endif
9894
99- TESTBINNAME := $(PROJECT ) _test
100- TESTBIN := $(BINDIR ) /$(TESTBINNAME )
10195DURATIONTESTBINNAME := $(PROJECT ) _duration_test
10296DURATIONTESTBIN := $(BINDIR ) /$(DURATIONTESTBINNAME )
10397RELEASE := $(GOBUILDDIR ) /bin/release
@@ -204,7 +198,7 @@ dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
204198
205199.PHONY : docker
206200docker : check-vars $(SOURCES ) dashboard/assets.go VERSION
207- docker build --build-arg VERSION=$(VERSION ) --build-arg COMMIT=$(COMMIT ) -f $( DOCKERFILE ) -t $(OPERATORIMAGE ) .
201+ docker build --build-arg VERSION=$(VERSION ) --build-arg COMMIT=$(COMMIT ) -f Dockerfile -t $(OPERATORIMAGE ) .
208202ifdef PUSHIMAGES
209203 docker push $(OPERATORIMAGE)
210204endif
@@ -297,14 +291,10 @@ else
297291 docker build -f Dockerfile.unittest .
298292endif
299293
300- $(TESTBIN ) : $(GOBUILDDIR ) $(SOURCES )
301- @mkdir -p $(BINDIR )
302- CGO_ENABLED=0 go test -c -installsuffix netgo -ldflags " -X main.projectVersion=$( VERSION) -X main.projectBuild=$( COMMIT) " -o $(TESTBIN ) $(REPOPATH ) /tests
303-
304294
305295.PHONY : docker-test
306- docker-test : $( TESTBIN )
307- docker build --quiet -f $( DOCKERTESTFILE ) -t $(TESTIMAGE ) .
296+ docker-test : check-vars $( GOBUILDDIR ) $( SOURCES )
297+ docker build --quiet -f tests/Dockerfile -t $(TESTIMAGE ) .
308298
309299.PHONY : run-upgrade-tests
310300run-upgrade-tests :
@@ -356,7 +346,7 @@ $(DURATIONTESTBIN): $(SOURCES)
356346
357347.PHONY : docker-duration-test
358348docker-duration-test : $(DURATIONTESTBIN )
359- docker build --quiet -f $( DOCKERDURATIONTESTFILE ) -t $(DURATIONTESTIMAGE ) .
349+ docker build --quiet -f tests/duration/Dockerfile -t $(DURATIONTESTIMAGE ) .
360350ifdef PUSHIMAGES
361351 docker push $(DURATIONTESTIMAGE)
362352endif
0 commit comments