[tor-commits] [tor-messenger-build/master] Build Tor Launcher in a container

[sukhbir at torproject.org]

commit 08bcd366ed439291b67efc40494e10e05fc63e34
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Feb 5 10:40:10 2018 -0500

    Build Tor Launcher in a container
---
 projects/tor-launcher/build  | 4 ++--
 projects/tor-launcher/config | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 45be6a6..f9cf764 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -1,5 +1,5 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+[% c("var/set_default_env") -%]
 tar xvf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
 [% IF c("var/tor_control_port") -%]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index aa83531..67a31b3 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -5,9 +5,13 @@ git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
 tag_gpg_id: 1
 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
+var:
+  container:
+    use_container: 1
 input_files:
   - filename: controlport.patch
     content: '[% INCLUDE controlport.patch.tmpl -%]'
     refresh_input: 1
     enable: '[% c("var/tor_control_port") %]'
   - filename: tm-logo.svg
+  - project: container-image