Final fix for travis?

3 years ago · 5c97af4fb3
parent 57836c2bf5
commit 5c97af4fb3
3 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -32,11 +32,11 @@ test-all: test-x86 test-arm

 .PHONY: test-s3-x86
 test-s3-x86:
-	cd tests && ./test-s3.sh ubuntu
+	cd tests && ./test-s3.sh Dockerfile

 .PHONY: test-s3-arm
 test-s3-arm:
-	cd tests && ./test-s3.sh raspbian
+	cd tests && ./test-s3.sh Dockerfile.armhf

 .PHONY: test-s3-all
 test-s3-all: test-s3-x86 test-s3-arm
--- a/tests/docker-compose-test-s3.yml
+++ b/tests/docker-compose-test-s3.yml
@ -3,7 +3,7 @@ services:
  duplicity:
    build:
      context: ..
-      dockerfile: Dockerfile.${DOCKER_BASE}
+      dockerfile: ${DOCKERFILE}
    entrypoint: "bash"
    command: ["/test.sh"]
    hostname: itest
--- a/tests/test-s3.sh
+++ b/tests/test-s3.sh
@ -1,6 +1,6 @@
 #! /bin/bash

-export DOCKER_BASE=$1
+export DOCKERFILE=$1

 docker-compose -f docker-compose-test-s3.yml up \
    --build --abort-on-container-exit --force-recreate