@@ -58,25 +58,32 @@ def generate_deb_src_files
58
58
end
59
59
60
60
def run_build
61
- # podman run options
61
+ # podman create options
62
62
create_opts = " -v #{ @pgpm_dir } :/root/pgpm"
63
63
create_opts += ":z" if selinux_enabled?
64
- create_opts += " --privileged --tmpfs /tmp" #--privileged --cap-add=sys_admin --security-opt label:disable -v /proc:/proc
64
+ create_opts += " --privileged --tmpfs /tmp"
65
65
create_opts += " --name #{ @container_name } #{ image_name } "
66
66
67
67
dsc_fn = "#{ @spec . package . name } -#{ @spec . package . version . to_s } _0-1.dsc"
68
68
deb_fn = "#{ @spec . full_pkg_name } .deb"
69
69
70
- # commands to run
71
- cmds = " /bin/bash -c 'cd /root/pgpm/source"
72
- cmds += " && dpkg-buildpackage --build=source -d" # -d flag helps with dependencies error
73
- cmds += " && fakeroot pbuilder build ../#{ dsc_fn } "
74
- cmds += " && mv /var/cache/pbuilder/result/#{ deb_fn } /root/pgpm/out/'"
75
-
76
70
puts " Creating and starting container #{ @container_name } & running pbuilder"
77
- puts "podman run -it #{ create_opts } #{ cmds } "
78
- system ( "podman run -it #{ create_opts } #{ cmds } " )
71
+ system ( "podman create -it #{ create_opts } " )
72
+ exit ( 1 ) if $?. to_i > 0
73
+ system ( "podman start #{ @container_name } " )
79
74
exit ( 1 ) if $?. to_i > 0
75
+
76
+ cmds = [ ]
77
+ cmds << "dpkg-buildpackage --build=source -d" # -d flag helps with dependencies error
78
+ cmds << "fakeroot pbuilder build ../#{ dsc_fn } "
79
+ cmds << "mv /var/cache/pbuilder/result/#{ deb_fn } /root/pgpm/out/"
80
+
81
+ puts " Building package with pbuilder..."
82
+ cmds . each do |cmd |
83
+ system ( "podman exec -w /root/pgpm/source #{ @container_name } /bin/bash -c '#{ cmd } '" )
84
+ exit ( 1 ) if $?. to_i > 0
85
+ end
86
+
80
87
end
81
88
82
89
def copy_build_from_container
@@ -88,7 +95,8 @@ def copy_build_from_container
88
95
def cleanup
89
96
puts "Cleaning up..."
90
97
91
- puts " Destroying podman container: #{ @container_name } "
98
+ puts " Stopping destroying podman container: #{ @container_name } "
99
+ system ( "podman container stop #{ @container_name } " )
92
100
system ( "podman container rm #{ @container_name } " )
93
101
94
102
# Remove temporary files
0 commit comments