vividboarder/docker-restic-cron
1
0
Fork 0
mirror of https://github.com/ViViDboarder/docker-restic-cron.git synced 2024-11-23 05:36:38 +00:00
Code Issues Releases Wiki Activity

Additional cleanup after merge

Browse Source
This commit is contained in:
ViViDboarder 2019-01-28 11:55:12 -08:00
parent 0e94d30c3e
commit e03322250e
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -22,11 +22,6 @@ test-x86: build-x86
cd tests && ./test.sh $(DOCKER_TAG) cd tests && ./test.sh $(DOCKER_TAG)
cd tests && ./test-pre-scripts.sh $(DOCKER_TAG) cd tests && ./test-pre-scripts.sh $(DOCKER_TAG)
.PHONY: test-arm
test-arm: build-arm
cd tests && .test.sh $(DOCKER_TAG):raspbian
cd tests && ./test-pre-scripts.sh $(DOCKER_TAG):raspbian
.PHONY: test-all .PHONY: test-all
test-all: test-x86 test-arm test-all: test-x86 test-arm
@ -34,10 +29,6 @@ test-all: test-x86 test-arm
test-s3-x86: test-s3-x86:
cd tests && ./test-s3.sh ubuntu cd tests && ./test-s3.sh ubuntu
.PHONY: test-s3-arm
test-s3-arm:
cd tests && ./test-s3.sh raspbian
.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
@ -45,10 +36,6 @@ test-s3-all: test-s3-x86 test-s3-arm
shell-x86: build-x86 shell-x86: build-x86
docker run --rm -it $(DOCKER_TAG) bash docker run --rm -it $(DOCKER_TAG) bash
.PHONY: shell-arm
shell-arm: build-arm
docker run --rm -it $(DOCKER_TAG):raspbian bash
.PHONY: shell .PHONY: shell
shell: shell-x86 shell: shell-x86

8
tests/test-pre-scripts.sh
View File

@ -8,6 +8,7 @@ if [ "$IN_CONTAINER" != "true" ] ; then
docker run --rm \ docker run --rm \
-e IN_CONTAINER=true \ -e IN_CONTAINER=true \
-e SKIP_ON_START=true \ -e SKIP_ON_START=true \
-e RESTIC_PASSWORD="Correct.Horse.Battery.Staple" \
-v "$(pwd)/test-pre-scripts.sh:/test.sh" \ -v "$(pwd)/test-pre-scripts.sh:/test.sh" \
-v "$(pwd)/test-pre-scripts:/scripts" \ -v "$(pwd)/test-pre-scripts:/scripts" \
$image \ $image \
@ -28,6 +29,9 @@ else
touch /data/test_database.db touch /data/test_database.db
sqlite3 /data/test_database.db < /scripts/create-test-data.sql sqlite3 /data/test_database.db < /scripts/create-test-data.sql
echo "Fake a start and init repo"
CRON_SCHEDULE="" /start.sh
echo "Making backup..." echo "Making backup..."
/backup.sh /backup.sh
@ -41,7 +45,7 @@ else
test -f /data/test_database.db && exit 1 || echo "Gone" test -f /data/test_database.db && exit 1 || echo "Gone"
echo "Restore backup..." echo "Restore backup..."
/restore.sh /restore.sh latest
echo "Verify restored files exist..." echo "Verify restored files exist..."
test -f /data/test_database.db test -f /data/test_database.db
@ -67,5 +71,5 @@ else
echo "Verify restore with incorrect passphrase fails..." echo "Verify restore with incorrect passphrase fails..."
echo "Fail to restore backup..." echo "Fail to restore backup..."
PASSPHRASE=Incorrect.Mule.Solar.Paperclip /restore.sh && exit 1 || echo "OK" RESTIC_PASSWORD=Incorrect.Mule.Solar.Paperclip /restore.sh latest && exit 1 || echo "OK"
fi fi