- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 67fbf56501a186f0934db144c7087834229d5da4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:33:19 2017 +0200 Bug 21239: Adapt Linux Firefox descriptor to ESR52 tor-browser-bundle.git commit: f279b94f424c1c7eeabaa0119ccfc8fea326bed6 --- projects/firefox/build | 8 +++----- projects/firefox/config | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1dce495..8b36428 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -35,8 +35,7 @@ mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/components -mkdir -p $distdir/Debug/Browser/browser/components +mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -124,7 +123,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" +NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -136,7 +135,7 @@ cd $distdir [% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater +for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -151,7 +150,6 @@ done [% IF c("var/windows") || c("var/linux") %] [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] - [% IF c("var/linux") %][% c("var/rezip", { rezip_file => 'Browser/webapprt/omni.ja' }) %][% END %] [% ELSIF c("var/osx") %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] diff --git a/projects/firefox/config b/projects/firefox/config index c71025d..83307d0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -33,14 +33,14 @@ targets: arch_deps: - libgtk2.0-dev - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - libxt-dev - hardening-wrapper # To pass configure since ESR 31. - libpulse-dev # To pass configure since ESR 45. - libgconf2-dev + # To pass configure since ESR 52 + - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 @@ -52,14 +52,13 @@ targets: - libc6-dev-i386 - libgtk2.0-dev:i386 - libdbus-glib-1-dev:i386 - - lib32asound2-dev - - libasound2-dev:i386 - - libgstreamer-plugins-base0.10-dev:i386 - libxt-dev:i386 # To pass configure since ESR 31. - libpulse-dev:i386 # To pass configure since ESR 45. - libgconf2-dev:i386 + # To pass configure since ESR 52 + - libx11-xcb-dev:i386 # We built GCC but not the libmpc2, thus we need to install it - libmpc2 - hardening-wrapper

1 0

[tor-browser-build/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit ec86de4f618aa28c3694a5af1fb941cde802cae6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:12:44 2017 +0200 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. tor-browser-bundle.git commit: 50b6e6fff4a535044f9b506854535df757125267 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 496c215..abd699b 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -73,7 +73,7 @@ export CC='gcc -m32' rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" +make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true

1 0

[tor-browser-build/master] Bug 21709: Upgrade Go to 1.7.5.
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 949c0d9e83d911b2fa80279edddb06c7e6299c80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:11:41 2017 +0200 Bug 21709: Upgrade Go to 1.7.5. tor-browser-bundle.git commit: 1942f7b2f6e5f82c64dcfeab82713604866cb26f --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index dbd7aab..89b4b45 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.7.4 +version: 1.7.5 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -75,7 +75,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21849: Don't allow SSL key logging
by gk＠torproject.org 07 Apr '17

07 Apr '17

commit 47fa36dc780f4962102205b390e18ce9ef74b1b9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 6 17:09:09 2017 -0700 Bug 21849: Don't allow SSL key logging --- config/external/nss/Makefile.in | 2 +- security/nss/lib/ssl/ssl.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 939529e..3f31d3b 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -241,7 +241,7 @@ DEFAULT_GMAKE_FLAGS += \ endif DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 $(FREEBL_LOWHASH_FLAG) -DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=1 +DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=0 ifdef MOZ_NO_WLZDEFS DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG= diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 0306ab6..5c025d2 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -89,7 +89,7 @@ ], 'target_defaults': { 'defines': [ - 'NSS_ALLOW_SSLKEYLOGFILE=1' + 'NSS_ALLOW_SSLKEYLOGFILE=0' ] }, 'variables': {

1 0

[tor-browser-build/master] Bug 20426: set timestamp on files included in the Windows bundle
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 2a15e10d49e437dd3637136692a86a9473c78e6d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:52:25 2017 +0200 Bug 20426: set timestamp on files included in the Windows bundle --- projects/tor-browser/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 814f7af..7134367 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -257,6 +257,7 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] + find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; pushd "${TB_STAGE_DIR}" makensis torbrowser.nsi # Working around NSIS braindamage @@ -324,6 +325,7 @@ rm -rf $distdir/${PKG_DIR} dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] + find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" makensis torbrowser.nsi # Working around NSIS braindamage

1 0

[tor-browser-build/master] Bug 20426: build tor for Windows using faketime
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 8cc61d29d348e154f43474b47a0b0746301602a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:50:11 2017 +0200 Bug 20426: build tor for Windows using faketime --- projects/tor/build | 4 ++-- projects/tor/config | 4 ++++ rbm.conf | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 064ff44..c1296fe 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -60,8 +60,8 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] -[% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 +[% IF c("var/osx") || c("var/windows") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/projects/tor/config b/projects/tor/config index 55637dc..961c1f3 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -40,6 +40,10 @@ targets: var: arch_deps: - faketime + windows-i686: + var: + arch_deps: + - faketime expert-bundle: var: expert_bundle: 1 diff --git a/rbm.conf b/rbm.conf index d7c8b34..355c593 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/faketime/libfaketime.so.1 torbrowser-osx-x86_64: - osx-x86_64 @@ -184,6 +185,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0

[tor-browser-build/master] Build go for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a8d3b0b4e1dbbaffea0139eb1f128d2429eecc02 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:56:36 2017 +0200 Build go for OSX using the clang based toolchain Doing the changes corresponding to #21753. --- projects/go/build | 7 +++++-- projects/go/config | 8 +------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/go/build b/projects/go/build index 72117f6..2f87bf5 100644 --- a/projects/go/build +++ b/projects/go/build @@ -38,16 +38,19 @@ cd /var/tmp/dist/go/src [% IF c("var/linux") -%] ./make.bash [% ELSIF c("var/osx") -%] + unset LDFLAGS + rm -Rf $clangdir/helpers + export CC="$clangdir/bin/clang [% c("var/FLAGS") %]" # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOOS=darwin - export GOARCH=386 + export GOARCH=amd64 # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. # https://github.com/golang/go/issues/17732 sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go diff --git a/projects/go/config b/projects/go/config index 870dc50..dbd7aab 100644 --- a/projects/go/config +++ b/projects/go/config @@ -56,14 +56,8 @@ targets: GOARCH: 386 osx-x86_64: var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - 10_7_SDK: 1 GOOS: darwin - GOARCH: 386 + GOARCH: amd64 linux: var: GOOS: linux

1 0

[tor-browser-build/master] Build gmp for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a7545d82294661640369a88fef114066330c3f7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:04:19 2017 +0200 Build gmp for OSX using the clang based toolchain --- projects/gmp/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/gmp/config b/projects/gmp/config index 4c730e5..913f181 100644 --- a/projects/gmp/config +++ b/projects/gmp/config @@ -7,14 +7,6 @@ targets: linux: var: configure_opt_gmp: --enable-fat - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=x86_64-apple-darwin11 input_files: - name: gmp

1 0

[tor-browser-build/master] macosx-toolchain setup: export LDFLAGS and CC
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 0bad542a31e3353c29132454342c6d8c5af9c914 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:54:01 2017 +0200 macosx-toolchain setup: export LDFLAGS and CC --- projects/macosx-toolchain/config | 2 ++ rbm.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 6458485..b237e4d 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -11,6 +11,8 @@ var: export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib + export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]" + export LDFLAGS="[% c('var/LDFLAGS') %]" input_files: - name: llvm diff --git a/rbm.conf b/rbm.conf index e206193..868c30a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -174,6 +174,7 @@ targets: compiler: 'macosx-toolchain' configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac deps: - build-essential

1 0

[tor-browser-build/master] Bug 21754: remove the old GCC-based toolchain for macOS
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 916f99775b4eabf50983441d95f65c7e149dbab9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:08:19 2017 +0200 Bug 21754: remove the old GCC-based toolchain for macOS --- projects/macosx-toolchain-gcc/build | 7 ------ projects/macosx-toolchain-gcc/config | 41 ------------------------------------ 2 files changed, 48 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build deleted file mode 100644 index 4a8f0db..0000000 --- a/projects/macosx-toolchain-gcc/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -destdir='[% dest_dir _ '/' _ c('filename') %]' -mkdir -p "$destdir" -mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb -mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz -mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config deleted file mode 100644 index 31ac46f..0000000 --- a/projects/macosx-toolchain-gcc/config +++ /dev/null @@ -1,41 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -version: 1 -remote_docker: 1 -var: - setup: | - macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc - mkdir -p $macosx_toolchain_gcc_dir - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz - export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" - # For OpenSSL - ln -s $macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - - - [% IF pc(c('origin_project'), "var/10_7_SDK") %] - export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar - export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc - export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz - export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" - [% ELSE %] - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - [% END %] - -input_files: - - name: SDK - URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… - sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - - name: SDK_10_7 - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - - name: toolchain - URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… - sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 - - project: docker-image

1 0