From 1594335487d9be62e7e51fae294bc4e0f6e34f87 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 12 Feb 2019 17:27:56 +0100 Subject: [PATCH] Experiment with manifest code. --- .deploy/docker/manifest.sh | 10 ---------- .travis.yml | 10 ++++++++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.deploy/docker/manifest.sh b/.deploy/docker/manifest.sh index e44f3a7b14..f67bf4792f 100755 --- a/.deploy/docker/manifest.sh +++ b/.deploy/docker/manifest.sh @@ -1,15 +1,5 @@ #!/usr/bin/env bash - -# enable experimental features. -echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json -sudo service docker restart -docker version -f '{{.Server.Experimental}}' - -echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json - -docker version - if [ "$TRAVIS_BRANCH" == "develop" ]; then TARGET=jc5x/firefly-iii:develop ARM=jc5x/firefly-iii:develop-arm diff --git a/.travis.yml b/.travis.yml index 8e4c6b7b4b..cee3809f40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,12 @@ services: script: # build everything - - .deploy/docker/build-amd64.sh - - .deploy/docker/build-arm.sh + - # enable experimental features. + - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json + - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json + - sudo service docker restart + - docker version -f '{{.Server.Experimental}}' + - docker version - .deploy/docker/manifest.sh + - .deploy/docker/build-amd64.sh + - .deploy/docker/build-arm.s