bricky 0.0.34 → 0.0.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/etc/bricks/debian/builder +6 -3
- data/etc/bricks/system/builder +1 -0
- data/etc/hacker/id_container/Dockerfile +1 -1
- data/lib/bricky/bricks/debian.rb +9 -6
- data/lib/bricky/bricks/system.rb +13 -0
- data/lib/bricky/bricks.rb +4 -3
- data/lib/bricky/commands/bootstrap.rb +1 -1
- data/lib/bricky/version.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MmQ0N2IzYjk0NjljMGY2YmMzNWI0YTUzMDYxMzBmM2FjZGY0ZGZjOA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YjBiM2U3M2UyY2Y5MTM3N2E3ZjhkY2JlMzk5Y2Q4MzgyZTkxNzc0MA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MmZmM2RhMGU0MjRjOGRhY2ZiODFmNjE3ZjVhMGNmYWZjYTc0Zjk3NWY0NGI0
|
10
|
+
M2MzN2Q1NjUwY2E5MjlkYzAwZjEwMzkzNGRlODBlNmZiODBmZTlhMTM5NmZj
|
11
|
+
MGQ2MjY5ZWEyYzIxYzA2NmZkY2I5NWYzYTNkODliZWQxODAwMDk=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YmVlMDkyM2Q5MGU3ZjYwN2I1MzMxZmQwZmQyZjJjNGJkMjQxYzNlNzkzYzkz
|
14
|
+
MDBmYzZmYjQwNmMyYjliZTg2NWMyNTM0Y2FmNjlmNmVhNmQyN2ViMmIyZGI0
|
15
|
+
M2Q2Njk1YjFiNWVlM2U3YTMxM2I5OTk3ODdiYjNkZjgyZjg0YjA=
|
data/etc/bricks/debian/builder
CHANGED
@@ -8,7 +8,7 @@ debdch() {
|
|
8
8
|
raw_tag=$(git tag | grep v | sort -t. -k 1.2,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)
|
9
9
|
use_tag=$(echo $raw_tag | tr -d 'v')
|
10
10
|
build_number="$(ls /builded/*$use_tag+build.*deb 2> /dev/null | wc -l)"
|
11
|
-
|
11
|
+
|
12
12
|
if [ $build_number -gt 0 ]
|
13
13
|
then
|
14
14
|
lastest=$(ls /builded/*$use_tag+build.*deb | sort | tail -1)
|
@@ -19,7 +19,7 @@ debdch() {
|
|
19
19
|
tag="$use_tag+build.$build_number"
|
20
20
|
echo "version: $tag"
|
21
21
|
echo "distribution: unstable"
|
22
|
-
|
22
|
+
|
23
23
|
dch --distribution 'unstable' --newVersion "$tag" 'Builded by bricky.'
|
24
24
|
}
|
25
25
|
|
@@ -31,7 +31,7 @@ debrep() {
|
|
31
31
|
|
32
32
|
debian() {
|
33
33
|
info 'Starting buildpackage'
|
34
|
-
dpkg-buildpackage -b -rfakeroot
|
34
|
+
dpkg-buildpackage -uc -us -b -rfakeroot
|
35
35
|
|
36
36
|
info 'Moving deb files to volume'
|
37
37
|
mv /opt/workspace/*.deb /opt/workspace/*.changes /builded/
|
@@ -39,6 +39,9 @@ debian() {
|
|
39
39
|
}
|
40
40
|
|
41
41
|
pushd /opt/workspace/source
|
42
|
+
# suppress warnings
|
43
|
+
chmod 755 /root && touch /root/.dpkg.cfg
|
44
|
+
|
42
45
|
[[ $BRICKS_DEBIAN_CHANGELOG == "true" ]] && suexec debdch
|
43
46
|
suexec debian
|
44
47
|
[[ $BRICKS_DEBIAN_REPOSITORY == "true" ]] && suexec debrep
|
@@ -0,0 +1 @@
|
|
1
|
+
#!/bin/bash -e
|
data/lib/bricky/bricks/debian.rb
CHANGED
@@ -21,12 +21,8 @@ module Bricky
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def bootstrap(bootstrap_path)
|
24
|
-
|
25
|
-
|
26
|
-
dest = "#{bootstrap_path}/control"
|
27
|
-
|
28
|
-
FileUtils.cp(src, dest) unless skip_cached_file(src, dest)
|
29
|
-
["COPY control /tmp/control", "RUN yes | mk-build-deps --install /tmp/control"]
|
24
|
+
["RUN apt-get install -y --force-yes libfile-fcntllock-perl"].tap do |deps|
|
25
|
+
deps << package_build_dependencies(bootstrap_path) if config.fetch('dependencies', false)
|
30
26
|
end
|
31
27
|
end
|
32
28
|
|
@@ -35,6 +31,13 @@ module Bricky
|
|
35
31
|
File.expand_path(ENV.fetch('BRICKY_PACKAGE_OUTPUT_PATH', config['build']))
|
36
32
|
end
|
37
33
|
|
34
|
+
def package_build_dependencies(bootstrap_path)
|
35
|
+
["COPY control /tmp/control", "RUN yes | mk-build-deps --install /tmp/control"].tap do |deps|
|
36
|
+
src, dest = File.expand_path('debian/control'), "#{bootstrap_path}/control"
|
37
|
+
FileUtils.cp(src, dest) unless skip_cached_file(src, dest)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
38
41
|
def skip_cached_file(src, dest)
|
39
42
|
return false if not File.exists?(dest)
|
40
43
|
|
data/lib/bricky/bricks.rb
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
require "bricky/bricks/base"
|
2
2
|
|
3
3
|
require "bricky/bricks/helper"
|
4
|
-
require "bricky/bricks/ruby"
|
5
|
-
require "bricky/bricks/rails"
|
6
4
|
require "bricky/bricks/bundle"
|
7
5
|
require "bricky/bricks/debian"
|
8
|
-
require 'bricky/bricks/dotenv'
|
9
6
|
require "bricky/bricks/mounts"
|
7
|
+
require "bricky/bricks/rails"
|
8
|
+
require "bricky/bricks/ruby"
|
10
9
|
require "bricky/bricks/version"
|
10
|
+
require 'bricky/bricks/dotenv'
|
11
|
+
require 'bricky/bricks/system'
|
11
12
|
|
12
13
|
module Bricky
|
13
14
|
module Bricks
|
data/lib/bricky/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bricky
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.35
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- andrerocker
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-09-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -99,6 +99,7 @@ files:
|
|
99
99
|
- etc/bricks/helper/suexec
|
100
100
|
- etc/bricks/mounts/builder
|
101
101
|
- etc/bricks/rails/builder
|
102
|
+
- etc/bricks/system/builder
|
102
103
|
- etc/bricks/version/builder
|
103
104
|
- etc/hacker/id_container/Dockerfile
|
104
105
|
- etc/templates/Brickyfile
|
@@ -114,6 +115,7 @@ files:
|
|
114
115
|
- lib/bricky/bricks/mounts.rb
|
115
116
|
- lib/bricky/bricks/rails.rb
|
116
117
|
- lib/bricky/bricks/ruby.rb
|
118
|
+
- lib/bricky/bricks/system.rb
|
117
119
|
- lib/bricky/bricks/version.rb
|
118
120
|
- lib/bricky/command.rb
|
119
121
|
- lib/bricky/commands/base.rb
|