Commit ef0055d2 authored by Julien Muchembled's avatar Julien Muchembled

helloweb: stop using collective.recipe.template

parent 9b2c9835
...@@ -34,11 +34,10 @@ install = ...@@ -34,11 +34,10 @@ install =
[helloweb-go] [helloweb-go]
# we already have gowork/bin/helloweb with helloweb Go build. # we already have gowork/bin/helloweb with helloweb Go build.
# Add bin/helloweb-go that runs go version of helloweb without any environment preset needed. # Add bin/helloweb-go that runs go version of helloweb without any environment preset needed.
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
output = ${buildout:bin-directory}/${:_buildout_section_name_} rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
mode = 0755 template =
input = inline: inline:#!/bin/sh -e
#!/bin/sh
. ${gowork:env.sh} . ${gowork:env.sh}
exec helloweb "$@" exec helloweb "$@"
...@@ -93,15 +92,14 @@ path = ${helloweb:location}/ruby/ ...@@ -93,15 +92,14 @@ path = ${helloweb:location}/ruby/
configure-command = : configure-command = :
make-binary = make-binary =
make-targets= cd ${:path} && ${bundler:bundle} install make-targets= ${bundler:bundle} install
[helloweb-ruby] [helloweb-ruby]
# NOTE slapos.cookbook:wrapper also works, but currently _only_ in instance # NOTE slapos.cookbook:wrapper also works, but currently _only_ in instance
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
output = ${buildout:bin-directory}/${:_buildout_section_name_} rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
mode = 0755 template =
input = inline: inline:#!/bin/sh -e
#!/bin/sh
export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@" exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
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