commit 37b09e546b078ca7bf540de2cd4fa3223dfbd5b5 Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Jul 19 14:42:28 2017 -0400
Continue the transition from docker to runc --- projects/instantbird/config | 34 ++++++++++++++++------------------ projects/libgcrypt/build | 2 +- projects/libgcrypt/config | 6 ++++-- projects/libgpg-error/build | 2 +- projects/libgpg-error/config | 6 ++++-- projects/libotr/build | 2 +- projects/libotr/config | 6 ++++-- projects/python/build | 15 --------------- projects/python/config | 18 ------------------ projects/tor-messenger/config | 5 +++-- 10 files changed, 34 insertions(+), 62 deletions(-)
diff --git a/projects/instantbird/config b/projects/instantbird/config index 8fd2e78..40bf243 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -3,21 +3,18 @@ version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ hg_hash: THUNDERBIRD_52_2_1_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" -remote_docker: 1 + var: archive_suffix: tar.bz2 deps: - build-essential - - libmpc-dev - - autoconf2.13 - - python + - unzip - zip - - libidl-dev - - uuid-runtime - - imagemagick - - ccache + - autoconf2.13 - yasm - - git-core + - python + container: + use_container: 1 targets: windows-i686: var: @@ -38,6 +35,7 @@ targets: - libpulse-dev - libxt-dev - libx11-xcb-dev + - hardening-wrapper linux-i686: var: martools_filename: mar-tools-linux32.zip @@ -95,17 +93,17 @@ input_files: - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' - name: mozilla project: mozilla - - name: python - project: python - enable: '[% c("var/linux") %]' - name: binutils project: binutils enable: '[% c("var/linux") %]' - - name: gcchost - project: gcc - enable: '[% c("var/osx") %]' - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: docker-image + - project: gcc + name: gcc + enable: '[% c("var/windows") %]' + - project: yasm + name: yasm + enable: '[% c("var/windows") %]' diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 9bd0710..ee6aebc 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 2b43818..0a7208d 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,11 +1,13 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.6.6 -remote_docker: 1 var: deps: - build-essential - libmpc-dev + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -24,4 +26,4 @@ input_files: name: libgpg-error - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index f650c2e..6bdb462 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) distdir="/var/tmp/dist/[% project %]" diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 48c10be..c667ca6 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,11 +1,13 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.20 -remote_docker: 1 var: deps: - build-essential - libmpc-dev + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -24,4 +26,4 @@ input_files: enable: '[% c("var/osx") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/libotr/build b/projects/libotr/build index 4cf811c..2b02051 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/projects/libotr/config b/projects/libotr/config index 6bb1826..a915aa8 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -1,12 +1,14 @@ # vim: filetype=yaml sw=2 version: 4.1.1 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 var: deps: - build-essential - libmpc-dev - file + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -31,4 +33,4 @@ input_files: name: libgpg-error - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/python/build b/projects/python/build deleted file mode 100644 index e27d06a..0000000 --- a/projects/python/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -rootdir=$(pwd) -distdir=/var/tmp/dist/python -mkdir -p $distdir -tar xf [% c('input_files_by_name/python') %] -cd Python-[% c('version') %] -./configure --prefix=$distdir -make -j4 -make prefix=$distdir install -cd /var/tmp/dist -[% c('tar', { - tar_src => 'python', - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/python/config b/projects/python/config deleted file mode 100644 index ade2cd5..0000000 --- a/projects/python/config +++ /dev/null @@ -1,18 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.7.8 -filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 -var: - deps: - - xz-utils - - build-essential - - python-all - - zlib1g-dev - - libssl-dev -input_files: - - name: python - URL: 'https://www.python.org/ftp/python/%5B% c("version") %]/Python-[% c("version") %].tar.xz' - gpg_keyring: python.gpg - sig_ext: asc - file_gpg_id: 1 - - project: docker-image diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 4b75b12..4395fc8 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -44,15 +44,16 @@ input_files: - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' - - project: docker-image + - project: container-image
-remote_docker: 1 distribution: Debian-7.11 var: deps: - p7zip-full - bzip2 - python + container: + use_container: 1 targets: windows-i686: distribution: Ubuntu-14.10