Try to work around some issues with the build
This commit is contained in:
parent
fe1db06d40
commit
ba46cdb7e7
|
@ -1,3 +1,3 @@
|
||||||
[submodule "ansible"]
|
[submodule "ansible"]
|
||||||
path = ansible
|
path = ansible
|
||||||
url = https://github.com/tootsuite/mastodon-ansible.git
|
url = https://github.com/tootsuite/mastodon-ansible
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [ "${1}" == "--version" ] ; then
|
|
||||||
echo "ansible-playbook 2.2.2.0"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec ansible-playbook "$@"
|
|
|
@ -0,0 +1 @@
|
||||||
|
localhost ansible_connection=local
|
|
@ -5,16 +5,13 @@
|
||||||
},
|
},
|
||||||
"provisioners": [
|
"provisioners": [
|
||||||
{
|
{
|
||||||
"type": "shell-local",
|
"type": "shell",
|
||||||
"command": "sudo apt-get update -qq"
|
"inline": [
|
||||||
},
|
"sudo apt-get update -qq",
|
||||||
{
|
"sudo apt-get install -y git-core python-pip python-apt libffi-dev libssl-dev build-essential python-virtualenv python-setuptools",
|
||||||
"type": "shell-local",
|
"mkdir -p /tmp/mastodon",
|
||||||
"command": "sudo apt-get install -y ansible git-core"
|
"git clone https://github.com/tootsuite/mastodon-ansible /tmp/mastodon/ansible"
|
||||||
},
|
]
|
||||||
{
|
|
||||||
"type": "shell-local",
|
|
||||||
"command": "git submodule update --recurse --init"
|
|
||||||
},
|
},
|
||||||
{ "type": "shell",
|
{ "type": "shell",
|
||||||
"inline": [
|
"inline": [
|
||||||
|
@ -32,23 +29,30 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "ansible",
|
"type": "shell",
|
||||||
"playbook_file": "ansible/playbook.yml",
|
"inline": [
|
||||||
"command": "./ansible-playbook-workaround",
|
"virtualenv venv",
|
||||||
"extra_arguments": [ "--extra-vars", "mastodon_db_password=CHANGEME" ],
|
". venv/bin/activate",
|
||||||
"ansible_env_vars": [
|
"pip install --upgrade ansible==2.2.2.0"
|
||||||
"ANSIBLE_REMOTE_TEMP=\"~/.ansible-tmp\"",
|
|
||||||
"ANSIBLE_SSH_PIPELINING=True"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{ "type": "shell",
|
{
|
||||||
"execute_command": "{{ .Vars }} sudo -E -S sh '{{ .Path }}'",
|
"type": "file",
|
||||||
"script": "scripts/clean.sh"
|
"source": "config/ansible.hosts",
|
||||||
|
"destination": "/tmp/mastodon/ansible.hosts"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "shell",
|
||||||
|
"environment_vars": ["ANSIBLE_REMOTE_TEMP=\"/tmp/mastodon/.ansible-tmp\"", "ANSIBLE_SSH_PIPELINING=True" ],
|
||||||
|
"inline": [
|
||||||
|
". venv/bin/activate",
|
||||||
|
"ansible-playbook -i /tmp/mastodon/ansible.hosts -v -b --extra-vars mastodon_db_password=CHANGEME /tmp/mastodon/ansible/playbook.yml"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"execute_command": "{{ .Vars }} sudo -E -S sh '{{ .Path }}'",
|
"execute_command": "{{ .Vars }} sudo -E -S sh '{{ .Path }}'",
|
||||||
"script": "scripts/minimize.sh"
|
"scripts": ["scripts/clean.sh", "scripts/minimize.sh"]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"builders": [
|
"builders": [
|
||||||
|
@ -117,20 +121,12 @@
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"created_at": "{{timestamp}}",
|
"created_at": "{{timestamp}}",
|
||||||
"description": "A Vagrant image for Mastodon development",
|
"description": "A Vagrant image for Mastodon development",
|
||||||
"provider": "virtualbox-iso",
|
"provider": "virtualbox-iso"
|
||||||
"version": "{{isotime \"20060102T15_04_05\"}}.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"push": {
|
"push": {
|
||||||
"name": "mastodon/ubuntu-xenial64",
|
"name": "mastodon/ubuntu-xenial64",
|
||||||
"vcs": false,
|
"vcs": true
|
||||||
"include": [
|
|
||||||
".git*",
|
|
||||||
".git/*",
|
|
||||||
".git/**/*",
|
|
||||||
"preseeds/*",
|
|
||||||
"scripts/*"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue