From 855200ae140cede16b5aa6fb36254c68eaca31c4 Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 17 Apr 2020 07:58:48 +0200 Subject: [PATCH 1/2] Update docker image and run instructions --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff0b12f3..45a216b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 LABEL description="Download CardDAV VCards and upload as phonebook to AVM FRITZ!Box" VOLUME [ "/data" ] diff --git a/README.md b/README.md index 8c8308d9..ac70e244 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ an example file to the volume. There are two ways to use the image: - docker run --rm -v ./carddav2fb-config:/data andig/carddav2fb command... + docker run --rm -v $(pwd)/carddav2fb-config:/data andig/carddav2fb command... will execute a single command (and remove the created container afterwards). From 2811e63a27cd17100de7efa404a88ab7b3ca0311 Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 17 Apr 2020 08:12:40 +0200 Subject: [PATCH 2/2] Upgrade php version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67abdc2f..4c38c522 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: php php: - - "7.1" + - "7.3" cache: directories: @@ -28,7 +28,7 @@ jobs: install: - composer install script: - - vendor/bin/phpunit + - ./vendor/bin/phpunit - # parallel install: - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini