commit | 44ec42642c7974307fdaa5a7b3f89169f05ea902 | [log] [tgz] |
---|---|---|
author | Filip Pytloun <filip@pytloun.cz> | Fri Jan 19 20:58:17 2018 +0100 |
committer | GitHub <noreply@github.com> | Fri Jan 19 20:58:17 2018 +0100 |
tree | 5d9f75b1574219b95b8527881092db664b3474f3 | |
parent | b3a0e0f600fb6125caba289d4d1182d0e61788c2 [diff] | |
parent | 8ebb5c7da364fe6df4efc8bc9fe503659bb082f5 [diff] |
Merge pull request #2 from ruzickap/feature/readme_update Docker way documented + directory fix
diff --git a/README.rst b/README.rst index c7d6fdc..0b4377d 100644 --- a/README.rst +++ b/README.rst
@@ -45,3 +45,13 @@ # cd <formula repository> curl -skL "https://raw.githubusercontent.com/salt-formulas/cookiecutter-salt-formula/master/kitchen-init.sh" | bash -s -- + +Docker way +=============================== + +.. code-block:: bash + + MY_NEW_SALT_FORMULA_DIR="my_new_salt_formula" + mkdir $MY_NEW_SALT_FORMULA_DIR + git clone https://github.com/salt-formulas/cookiecutter-salt-formula.git + docker run --rm -it -u $(id -u):$(id -g) --env HOME=/$MY_NEW_SALT_FORMULA_DIR -v $PWD/$MY_NEW_SALT_FORMULA_DIR:/$MY_NEW_SALT_FORMULA_DIR -v $PWD/cookiecutter-salt-formula:/cookiecutter-salt-formula:ro cookiecutter/cookiecutter /cookiecutter-salt-formula --output-dir /$MY_NEW_SALT_FORMULA_DIR
diff --git "a/\173\173cookiecutter.project_name\175\175/.gitignore" "b/\173\173cookiecutter.service_name\175\175/.gitignore" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/.gitignore" rename to "\173\173cookiecutter.service_name\175\175/.gitignore"
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml" rename to "\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.openstack.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml" rename to "\173\173cookiecutter.service_name\175\175/.kitchen.openstack.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.vagrant.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.vagrant.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/.kitchen.vagrant.yml" rename to "\173\173cookiecutter.service_name\175\175/.kitchen.vagrant.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/.travis.yml" "b/\173\173cookiecutter.service_name\175\175/.travis.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/.travis.yml" rename to "\173\173cookiecutter.service_name\175\175/.travis.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/CHANGELOG.rst" "b/\173\173cookiecutter.service_name\175\175/CHANGELOG.rst" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/CHANGELOG.rst" rename to "\173\173cookiecutter.service_name\175\175/CHANGELOG.rst"
diff --git "a/\173\173cookiecutter.project_name\175\175/INTEGRATION.rst" "b/\173\173cookiecutter.service_name\175\175/INTEGRATION.rst" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/INTEGRATION.rst" rename to "\173\173cookiecutter.service_name\175\175/INTEGRATION.rst"
diff --git "a/\173\173cookiecutter.project_name\175\175/LICENSE" "b/\173\173cookiecutter.service_name\175\175/LICENSE" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/LICENSE" rename to "\173\173cookiecutter.service_name\175\175/LICENSE"
diff --git "a/\173\173cookiecutter.project_name\175\175/Makefile" "b/\173\173cookiecutter.service_name\175\175/Makefile" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/Makefile" rename to "\173\173cookiecutter.service_name\175\175/Makefile"
diff --git "a/\173\173cookiecutter.project_name\175\175/README.rst" "b/\173\173cookiecutter.service_name\175\175/README.rst" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/README.rst" rename to "\173\173cookiecutter.service_name\175\175/README.rst"
diff --git "a/\173\173cookiecutter.project_name\175\175/VERSION" "b/\173\173cookiecutter.service_name\175\175/VERSION" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/VERSION" rename to "\173\173cookiecutter.service_name\175\175/VERSION"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/changelog" "b/\173\173cookiecutter.service_name\175\175/debian/changelog" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/changelog" rename to "\173\173cookiecutter.service_name\175\175/debian/changelog"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/compat" "b/\173\173cookiecutter.service_name\175\175/debian/compat" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/compat" rename to "\173\173cookiecutter.service_name\175\175/debian/compat"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/control" "b/\173\173cookiecutter.service_name\175\175/debian/control" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/control" rename to "\173\173cookiecutter.service_name\175\175/debian/control"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/copyright" "b/\173\173cookiecutter.service_name\175\175/debian/copyright" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/copyright" rename to "\173\173cookiecutter.service_name\175\175/debian/copyright"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/docs" "b/\173\173cookiecutter.service_name\175\175/debian/docs" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/docs" rename to "\173\173cookiecutter.service_name\175\175/debian/docs"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/rules" "b/\173\173cookiecutter.service_name\175\175/debian/rules" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/rules" rename to "\173\173cookiecutter.service_name\175\175/debian/rules"
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/source/format" "b/\173\173cookiecutter.service_name\175\175/debian/source/format" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/debian/source/format" rename to "\173\173cookiecutter.service_name\175\175/debian/source/format"
diff --git "a/\173\173cookiecutter.project_name\175\175/doc/source/conf.py" "b/\173\173cookiecutter.service_name\175\175/doc/source/conf.py" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/doc/source/conf.py" rename to "\173\173cookiecutter.service_name\175\175/doc/source/conf.py"
diff --git "a/\173\173cookiecutter.project_name\175\175/doc/source/index.rst" "b/\173\173cookiecutter.service_name\175\175/doc/source/index.rst" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/doc/source/index.rst" rename to "\173\173cookiecutter.service_name\175\175/doc/source/index.rst"
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata.yml" "b/\173\173cookiecutter.service_name\175\175/metadata.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/metadata.yml" rename to "\173\173cookiecutter.service_name\175\175/metadata.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/support.yml" "b/\173\173cookiecutter.service_name\175\175/metadata/service/support.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/metadata/service/support.yml" rename to "\173\173cookiecutter.service_name\175\175/metadata/service/support.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml" "b/\173\173cookiecutter.service_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml" rename to "\173\173cookiecutter.service_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml" "b/\173\173cookiecutter.service_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml" rename to "\173\173cookiecutter.service_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/releasenotes/config.yaml" "b/\173\173cookiecutter.service_name\175\175/releasenotes/config.yaml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/releasenotes/config.yaml" rename to "\173\173cookiecutter.service_name\175\175/releasenotes/config.yaml"
diff --git "a/\173\173cookiecutter.project_name\175\175/releasenotes/notes/add-releasenotes-9c076c7ee8fbe2a4.yaml" "b/\173\173cookiecutter.service_name\175\175/releasenotes/notes/add-releasenotes-9c076c7ee8fbe2a4.yaml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/releasenotes/notes/add-releasenotes-9c076c7ee8fbe2a4.yaml" rename to "\173\173cookiecutter.service_name\175\175/releasenotes/notes/add-releasenotes-9c076c7ee8fbe2a4.yaml"
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls" "b/\173\173cookiecutter.service_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls" rename to "\173\173cookiecutter.service_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls"
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/run_tests.sh" "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/tests/run_tests.sh" rename to "\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/init.sls" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/init.sls" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/init.sls" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/init.sls"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/map.jinja" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/map.jinja" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/map.jinja" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/map.jinja"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml"
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls" similarity index 100% rename from "\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls" rename to "\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"