Commit c801cfaa authored by Ernesto Rodriguez Ortiz's avatar Ernesto Rodriguez Ortiz
Browse files

Merge branch '7.x' of gitlab.savoirfairelinux.com:drupal/sfl-boilerplate into 7.x

parents d526e3c9 44e3bf2d
......@@ -29,3 +29,4 @@ build/sflinux
build/*.tar.gz
README.html
CHANGELOG.html
[submodule "drupalizer"]
path = drupalizer
[submodule "fabfile"]
path = fabfile
url = git@gitlab.savoirfairelinux.com:drupal/drupalizer.git
= Changelog
.0a115583cea98f085988cc6d3c89443feedb1118
24-03-2016
* The Drupalizer submodule has been renamed as *fabfile*, so it could be discovered as a Fabric module.
CAUTION: Be careful not to flush your config file during the following process.
To update:
$ git submodule sync
$ cp drupalizer/local_vars.py fabfile
$ rm -rf drupalizer
* In non-interactive mode, the container IP is now managed in the local_vars.py config file.
It will be updated when running the task *docker.container_start*.
For it to work on Jenkins, you need to add manually the following line, if not already there:
# Docker auto-added container IP
The current container IP will be added after this line. This is a workaround to avoid editing */etc/hosts*.
Once the line has been added, run:
$ fab docker.container_stop
$ fab docker.container_start
You should now see a new environment variable below the line you just added:
$ env.container_ip = '172.17.0.3'
''''
......@@ -70,20 +70,19 @@ First, you should clone this repository.
It is recommanded to clone with the _recursive_ option to automatically fetch the included _git submodules_ (namely, Drupalizer, our tasks-automation tool).
TIP: If you properly init the submodule, you should have a _drupalizer_ directory at the repository root.
TIP: If you properly init the submodule, you should have a _fabfile_ directory at the repository root.
Then, copy and, optionally, edit your local configuration file:
$ cd drupalizer; ln -s ../conf/drupalizer.py local_vars.py
$ cd fabfile; ln -s ../conf/drupalizer.py local_vars.py
You are now ready to build the SFLinux distribution:
$ cd drupalizer
$ fab init
The Docker image containing the Drupal installation should now be up and running, and the site should now be accessible at http://local.boilerplate.sfl.
include::drupalizer/README.adoc[]
include::fabfile/README.adoc[]
== Official documentation
......
......@@ -36,6 +36,8 @@ env.docker_site_root = '{}/src/drupal'.format(env.docker_workspace)
env.bind_port = 8001
env.apache_user = 'www-data'
# Docker auto-added container IP
env.container_ip = '172.17.0.0'
# Hook commands
......
Subproject commit 8a5cf31740fa1fda457529e17c56f29a127a2f56
Subproject commit 16bff396e43988d094d223ac4c92ccdedead81af
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment