Merge branch 'master' into feature/5-default_config_attributes

This commit is contained in:
Greg Karékinian 2019-06-20 18:22:44 +02:00
commit b2c7416087
3 changed files with 7 additions and 3 deletions

View File

@ -26,14 +26,14 @@ env:
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
- chef --version
- CHEF_LICENSE=accept-no-persist chef --version
- cookstyle --version
- foodcritic --version
script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml CHEF_VERSION=13.10.4 kitchen verify ${INSTANCE}
script: CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=.kitchen.dokken.yml CHEF_VERSION=13.10.4 kitchen verify ${INSTANCE}
matrix:
include:
- script:
- chef exec delivery local all
- CHEF_LICENSE=accept-no-persist chef exec delivery local all
env: UNIT_AND_LINT=1

View File

@ -2,6 +2,8 @@ node.default['ipfs']['version'] = '0.4.17'
node.default['ipfs']['checksum'] = '1bb1050ebe74f9042ac721eb1b71f92e1b0e78e54c59dadfde13080facb2901c'
node.default['ipfs']['cluster']['version'] = '0.4.0'
node.default['ipfs']['cluster']['service']['checksum'] = 'a168e9d3544f53f3d734098533d606b88417f6319bc8f83b1af7ef1328ed246a'
node.default['ipfs']['cluster']['ctl']['checksum'] = 'c82ba76b21a6fc42c8c635962a356c51fe6d4d0fbac2a77bfdd159cbe6a56f49'
node.default['ipfs']['config'] = {
# Do not contact local network addresses. This will stop platforms like Hetzner

View File

@ -30,11 +30,13 @@ version = node['ipfs']['cluster']['version']
ark 'ipfs-cluster-service' do
url "https://dist.ipfs.io/ipfs-cluster-service/v#{version}/ipfs-cluster-service_v#{version}_linux-amd64.tar.gz"
checksum node['ipfs']['cluster']['service']['checksum']
has_binaries ['ipfs-cluster-service']
end
ark 'ipfs-cluster-ctl' do
url "https://dist.ipfs.io/ipfs-cluster-ctl/v#{version}/ipfs-cluster-ctl_v#{version}_linux-amd64.tar.gz"
checksum node['ipfs']['cluster']['ctl']['checksum']
has_binaries ['ipfs-cluster-ctl']
end