vividboarder
/
docker-duplicity-cron
mirror of https://github.com/ViViDboarder/docker-duplicity-cron.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Final fix for travis?

This commit is contained in:
ViViDboarder 2019-08-05 18:07:53 -07:00
parent 57836c2bf5
commit 5c97af4fb3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -32,11 +32,11 @@ test-all: test-x86 test-arm
.PHONY: test-s3-x86 .PHONY: test-s3-x86
test-s3-x86: test-s3-x86:
cd tests && ./test-s3.sh ubuntu cd tests && ./test-s3.sh Dockerfile
.PHONY: test-s3-arm .PHONY: test-s3-arm
test-s3-arm: test-s3-arm:
cd tests && ./test-s3.sh raspbian cd tests && ./test-s3.sh Dockerfile.armhf
.PHONY: test-s3-all .PHONY: test-s3-all
test-s3-all: test-s3-x86 test-s3-arm test-s3-all: test-s3-x86 test-s3-arm

2
tests/docker-compose-test-s3.yml
View File

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

2
tests/test-s3.sh
View File

@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
export DOCKER_BASE=$1 export DOCKERFILE=$1
docker-compose -f docker-compose-test-s3.yml up \ docker-compose -f docker-compose-test-s3.yml up \
--build --abort-on-container-exit --force-recreate --build --abort-on-container-exit --force-recreate