[SCM] ci-tooling packaging branch, master, updated. bd814c0e17b8d5c194fb9077df03904ce8be4ba0

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=bd814c0

The following commit has been merged in the master branch:
commit bd814c0e17b8d5c194fb9077df03904ce8be4ba0
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Nov 19 22:10:45 2015 +0100

    Containment now does chown'ing by itself
---
 ci/builder.rb | 14 --------------
 ci/imager.rb  | 14 --------------
 ci/sourcer.rb | 14 --------------
 3 files changed, 42 deletions(-)

diff --git a/ci/builder.rb b/ci/builder.rb
index 6b60c45..35d78c5 100755
--- a/ci/builder.rb
+++ b/ci/builder.rb
@@ -14,17 +14,3 @@ Apt.update
 source = YAML::load_file('source.yaml')
 builder = CI::PackageBuilder.new
 builder.build(source)
-
-# Workaround for docker not having suidmaps. We run as root in the docker
-# which will result in uid/gid of written things to be 0 rather than whatever
-# jenkins has. So instead we have a fake jenkins user in the docker we can
-# chmod to. This ultimately ensures that the owernship is using the uid of
-# the host jenkins (equal to docker jenkins) such that we don't end up with
-# stuff owned by others.
-at_exit do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end
-
-Signal.trap 'TERM' do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end
diff --git a/ci/imager.rb b/ci/imager.rb
index 95b83d4..555dff6 100755
--- a/ci/imager.rb
+++ b/ci/imager.rb
@@ -13,17 +13,3 @@ Dir.chdir('live-config') do
   system('./configure')
   system('make')
 end
-
-# Workaround for docker not having suidmaps. We run as root in the docker
-# which will result in uid/gid of written things to be 0 rather than whatever
-# jenkins has. So instead we have a fake jenkins user in the docker we can
-# chmod to. This ultimately ensures that the owernship is using the uid of
-# the host jenkins (equal to docker jenkins) such that we don't end up with
-# stuff owned by others.
-at_exit do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end
-
-Signal.trap 'TERM' do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end
diff --git a/ci/sourcer.rb b/ci/sourcer.rb
index 6cab998..3b2a367 100755
--- a/ci/sourcer.rb
+++ b/ci/sourcer.rb
@@ -7,17 +7,3 @@ s = CI::VcsSourceBuilder.new(release: DIST)
 r = s.run
 # Write out metadata
 open('build/source.yaml', 'w+') { |f| f.write(YAML.dump(r)) }
-
-# Workaround for docker not having suidmaps. We run as root in the docker
-# which will result in uid/gid of written things to be 0 rather than whatever
-# jenkins has. So instead we have a fake jenkins user in the docker we can
-# chmod to. This ultimately ensures that the owernship is using the uid of
-# the host jenkins (equal to docker jenkins) such that we don't end up with
-# stuff owned by others.
-at_exit do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end
-
-Signal.trap 'TERM' do
-  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-end

-- 
ci-tooling packaging