From 692d15e479e7a367d166d2fd9fc7fa3c32cdade4 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 22 Jul 2020 09:39:05 -0500 Subject: [PATCH] Issue #295: More fixes for Ubuntu 20.04 compatibility. --- elk/provisioning/elk/vars/main.yml | 2 +- tests/docker-hubot.yml | 4 +--- tests/docker.yml | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/elk/provisioning/elk/vars/main.yml b/elk/provisioning/elk/vars/main.yml index 085cfd2..9ef93be 100644 --- a/elk/provisioning/elk/vars/main.yml +++ b/elk/provisioning/elk/vars/main.yml @@ -1,6 +1,6 @@ --- java_packages: - - openjdk-8-jdk + - openjdk-11-jdk nginx_user: www-data nginx_remove_default_vhost: true diff --git a/tests/docker-hubot.yml b/tests/docker-hubot.yml index 4a094c9..873ce50 100644 --- a/tests/docker-hubot.yml +++ b/tests/docker-hubot.yml @@ -4,9 +4,7 @@ vars: pip_package: python3-pip pip_install_packages: - # See: https://github.com/ansible/ansible/issues/35612 - - name: docker - version: "2.7.0" + - docker pre_tasks: - name: Update the apt cache. diff --git a/tests/docker.yml b/tests/docker.yml index 611c1da..57fa2af 100644 --- a/tests/docker.yml +++ b/tests/docker.yml @@ -4,9 +4,7 @@ vars: pip_package: python3-pip pip_install_packages: - # See: https://github.com/ansible/ansible/issues/35612 - - name: docker - version: "2.7.0" + - docker pre_tasks: - name: Update the apt cache so we can install ufw.