Skip to content

Commit 95b3c3a

Browse files
committed
Minor test improvement
1 parent a470066 commit 95b3c3a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ROOTDIR := $(shell cd $(SCRIPTDIR) && pwd)
55
GOBUILDDIR := $(SCRIPTDIR)/.gobuild
66
GOVERSION := 1.7.5-alpine
77

8-
ARANGODBVERSION := 3.1.12
8+
ARANGODB := arangodb:3.1.12
9+
#ARANGODB := neunhoef/arangodb:3.2.devel-1
910

1011
ORGPATH := github.com/arangodb
1112
ORGDIR := $(GOBUILDDIR)/src/$(ORGPATH)
@@ -31,14 +32,14 @@ $(GOBUILDDIR):
3132

3233
DBCONTAINER := $(PROJECT)-test-db
3334

34-
run-tests: build run-tests-single-no-auth run-tests-single-with-auth
35+
run-tests: build run-tests-single-with-auth run-tests-single-no-auth
3536

3637
run-tests-single-no-auth:
3738
@echo "Single server, no authentication"
3839
@-docker rm -f -v $(DBCONTAINER) &> /dev/null
3940
@docker run -d --name $(DBCONTAINER) \
4041
-e ARANGO_NO_AUTH=1 \
41-
arangodb:$(ARANGODBVERSION)
42+
$(ARANGODB)
4243
@docker run \
4344
--rm \
4445
--net=container:$(DBCONTAINER) \
@@ -55,7 +56,7 @@ run-tests-single-with-auth:
5556
@-docker rm -f -v $(DBCONTAINER) &> /dev/null
5657
@docker run -d --name $(DBCONTAINER) \
5758
-e ARANGO_ROOT_PASSWORD=rootpw \
58-
arangodb:$(ARANGODBVERSION)
59+
$(ARANGODB)
5960
@docker run \
6061
--rm \
6162
--net=container:$(DBCONTAINER) \

0 commit comments

Comments
 (0)