Merge branch 'master' into master

This commit is contained in:
Michael Russell 2019-05-02 16:23:49 +02:00 committed by GitHub
commit 73314dd6e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View file

@ -75,7 +75,8 @@ platforms:
image: debian:8
privileged: true
provision_command:
- echo "deb http://http.debian.net/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
- echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
- echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
- apt-get update && apt-get -y install -t jessie-backports openjdk-8-jre-headless
- apt-get update && apt-get -y install python python-dev python-pip build-essential libyaml-dev python-yaml curl wget net-tools
- sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config

View file

@ -3,7 +3,7 @@ GEM
specs:
builder (3.2.3)
erubis (2.7.0)
ffi (1.9.18)
ffi (1.9.24)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
@ -32,7 +32,7 @@ GEM
net-ssh (>= 2.6.5)
nori (2.6.0)
rubyntlm (0.6.2)
rubyzip (1.2.1)
rubyzip (1.2.2)
test-kitchen (1.20.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)