Cleanup

camptocamp · Jun 4, 2021 · cd354c8 · cd354c8
1 parent a028aff
commit cd354c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -19,10 +19,8 @@ build:
 
 .PHONY: acceptance
 acceptance: build
+	(cd acceptance_tests/ && docker-compose down)
+	(cd acceptance_tests/ && docker-compose build)
 	(cd acceptance_tests/ && docker-compose up -d)
-	(cd acceptance_tests/ && docker-compose exec -T acceptance bash -c 'cd /acceptance_tests ; py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml')
+	(cd acceptance_tests/ && docker-compose exec -T acceptance py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml
 	(cd acceptance_tests/ && docker-compose down)
-
-.PHONY: clean
-clean:
-	rm -rf acceptance_tests/junitxml/
diff --git a/acceptance_tests/Dockerfile b/acceptance_tests/Dockerfile
@@ -1,6 +1,8 @@
-FROM camptocamp/c2cwsgiutils:5
+FROM camptocamp/c2cwsgiutils:3
 
 WORKDIR /acceptance_tests
 COPY . ./
 
 CMD ["tail", "-f", "/dev/null"]
+
+ENV C2C_REQUESTS_DEFAULT_TIMEOUT=10
diff --git a/acceptance_tests/docker-compose.yaml b/acceptance_tests/docker-compose.yaml
@@ -38,12 +38,4 @@ services:
       - ./config/db/:/docker-entrypoint-initdb.d
 
   acceptance:
-    image: camptocamp/c2cwsgiutils:3
-    command:
-      - tail
-      - -f
-      - /dev/null
-    volumes:
-      - .:/acceptance_tests
-    environment:
-      C2C_REQUESTS_DEFAULT_TIMEOUT: '10'
+    build: .