commit 8eadae068d4806acf08b677e6ba1df02f86eee4c Author: Nicolas Vigier boklm@torproject.org Date: Mon Aug 31 19:49:00 2015 +0200

docker-image: use var/pre_pkginst and var/post_pkginst variables

The var/pre_pkginst and var/post_pkginst variables are used in the script to generate the docker image before and after the installation of packages. --- projects/docker-image/config | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/projects/docker-image/config b/projects/docker-image/config index f1b411c..0502743 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -25,6 +25,9 @@ pre: | #!/bin/sh # [% c('docker_image') %] set -e + [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] + [% pc(c('origin_project'), 'var/pre_pkginst') %] + [% END -%] [% IF c('lsb_release/id') == 'Ubuntu' %] apt-get update -y apt-get upgrade -y @@ -47,3 +50,6 @@ pre: | END; END; -%] + [% IF pc(c('origin_project'), 'var/post_pkginst') -%] + [% pc(c('origin_project'), 'var/post_pkginst') %] + [% END -%]