@@ -126,18 +126,17 @@ var buildCmd = &cobra.Command{
126
126
return
127
127
}
128
128
129
- tag := "temp-build-" + time .Now ().Format ("20060102150405" )
130
-
131
129
dockerPath , err := exec .LookPath ("docker" )
132
130
if err != nil {
133
131
fmt .Println ("Docker is not installed in your workspace" )
134
132
event .Set ("ErrorCode" , utils .RebuildErrorCode_DockerNotFound ).Send (ctx )
135
133
return
136
134
}
137
135
136
+ tag := "gp-rebuild-temp-build"
137
+
138
138
dockerCmd := exec .Command (dockerPath , "build" , "-t" , tag , "--progress=tty" , "." )
139
139
dockerCmd .Dir = tmpDir
140
-
141
140
dockerCmd .Stdout = os .Stdout
142
141
dockerCmd .Stderr = os .Stderr
143
142
@@ -148,10 +147,6 @@ var buildCmd = &cobra.Command{
148
147
}
149
148
}()
150
149
151
- // TODO: add docker run
152
- // TODO: add message to suggest how to exit
153
-
154
- // TODO: duration
155
150
err = dockerCmd .Run ()
156
151
if _ , ok := err .(* exec.ExitError ); ok {
157
152
fmt .Println ("Image Build Failed" )
@@ -164,6 +159,38 @@ var buildCmd = &cobra.Command{
164
159
log .Fatal (err )
165
160
return
166
161
}
162
+
163
+ // TODO: add message to suggest how to exit
164
+ // TODO: add docker run
165
+ dockerRunCmd := exec .Command (
166
+ dockerPath ,
167
+ "run" ,
168
+ "--rm" ,
169
+ // "--user", "root",
170
+ // "--privileged",
171
+ // "--label", "gp-rebuild=true",
172
+ // "--name", tag,
173
+ "-it" ,
174
+ tag ,
175
+ "bash" ,
176
+ )
177
+
178
+ dockerRunCmd .Stdout = os .Stdout
179
+ dockerRunCmd .Stderr = os .Stderr
180
+ dockerRunCmd .Stdin = os .Stdin
181
+
182
+ err = dockerRunCmd .Run ()
183
+ if _ , ok := err .(* exec.ExitError ); ok {
184
+ fmt .Println ("Docker Run Command Failed" )
185
+ event .Set ("ErrorCode" , utils .RebuildErrorCode_DockerRunFailed ).Send (ctx )
186
+ log .Fatal (err )
187
+ return
188
+ } else if err != nil {
189
+ fmt .Println ("Docker error" )
190
+ event .Set ("ErrorCode" , utils .RebuildErrorCode_DockerErr ).Send (ctx )
191
+ log .Fatal (err )
192
+ return
193
+ }
167
194
},
168
195
}
169
196
0 commit comments