Final fix for travis?

sqlite
ViViDboarder 3 years ago
parent 57836c2bf5
commit 5c97af4fb3
  1. 4
      Makefile
  2. 2
      tests/docker-compose-test-s3.yml
  3. 2
      tests/test-s3.sh

@ -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

@ -3,7 +3,7 @@ services:
duplicity:
build:
context: ..
dockerfile: Dockerfile.${DOCKER_BASE}
dockerfile: ${DOCKERFILE}
entrypoint: "bash"
command: ["/test.sh"]
hostname: itest

@ -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

Loading…
Cancel
Save