mirror of
https://github.com/frappe/bench.git
synced 2025-01-10 09:02:10 +00:00
feat(ubuntu 18): Add support for Ubuntu 18.04
- added ubuntu 18 in the list of supported OS for the easy install script - ensured the install script for mariadb which works on ubuntu xenial also works on ubuntu bionic - sidenote: prevented pip from installing requests, since a system package is already installed in centos 7 Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
This commit is contained in:
parent
2e7619c128
commit
de94469581
@ -36,7 +36,7 @@ def install_bench(args):
|
|||||||
# secure pip installation
|
# secure pip installation
|
||||||
if find_executable('pip'):
|
if find_executable('pip'):
|
||||||
run_os_command({
|
run_os_command({
|
||||||
'pip': 'sudo pip install --upgrade setuptools urllib3 requests cryptography pip'
|
'pip': 'sudo pip install --upgrade setuptools urllib3 cryptography pip'
|
||||||
})
|
})
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -55,7 +55,7 @@ def install_bench(args):
|
|||||||
})
|
})
|
||||||
|
|
||||||
success = run_os_command({
|
success = run_os_command({
|
||||||
'pip': "sudo pip install --upgrade urllib3 requests cryptography ansible"
|
'pip': "sudo pip install --upgrade urllib3 cryptography ansible"
|
||||||
})
|
})
|
||||||
|
|
||||||
if not success:
|
if not success:
|
||||||
@ -129,7 +129,7 @@ def install_bench(args):
|
|||||||
shutil.rmtree(tmp_bench_repo)
|
shutil.rmtree(tmp_bench_repo)
|
||||||
|
|
||||||
def check_distribution_compatibility():
|
def check_distribution_compatibility():
|
||||||
supported_dists = {'ubuntu': [14, 15, 16], 'debian': [8, 9],
|
supported_dists = {'ubuntu': [14, 15, 16, 18], 'debian': [8, 9],
|
||||||
'centos': [7], 'macos': [10.9, 10.10, 10.11, 10.12]}
|
'centos': [7], 'macos': [10.9, 10.10, 10.11, 10.12]}
|
||||||
|
|
||||||
dist_name, dist_version = get_distribution_info()
|
dist_name, dist_version = get_distribution_info()
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
- include: ubuntu-trusty.yml
|
- include: ubuntu-trusty.yml
|
||||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
|
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
|
||||||
|
|
||||||
- include: ubuntu-xenial.yml
|
- include: ubuntu-xenial_bionic.yml
|
||||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04'
|
when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 16
|
||||||
|
|
||||||
- name: Add configuration
|
- name: Add configuration
|
||||||
template: src={{ mysql_conf_tpl }} dest={{ mysql_conf_dir[ansible_distribution] }}/{{ mysql_conf_file }} owner=root group=root mode=0644
|
template: src={{ mysql_conf_tpl }} dest={{ mysql_conf_dir[ansible_distribution] }}/{{ mysql_conf_file }} owner=root group=root mode=0644
|
||||||
|
Loading…
Reference in New Issue
Block a user