Skip to content

DO NOT MERGE! Release 0.1.x #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
metacosm wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

DO NOT MERGE! Release 0.1.x #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd0676a
chore: go mod tidy
metacosm Oct 9, 2019
b33d7fd
fix: stop running app before building a new version
metacosm Oct 11, 2019
1a6c948
fix: perform build directly so that we can block until it's finished
metacosm Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,6 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
halkyon.io/api v1.0.0-beta.5 h1:hpmy6fK8uQSEkSf7/L3SAyjJXUoZ3ywXL5eukwrXPXE=
halkyon.io/api v1.0.0-beta.5/go.mod h1:cO9/hBS8zlmn/tcLFyZdbs03TwZHrRyDQSgvYQf9+fM=
halkyon.io/api v1.0.0-beta.7 h1:Uo3jMyYzMcM4U/4DbXM5Trky/VD9FpMnKWJMZDxiQcc=
halkyon.io/api v1.0.0-beta.7/go.mod h1:cO9/hBS8zlmn/tcLFyZdbs03TwZHrRyDQSgvYQf9+fM=
k8s.io/api v0.0.0-20190516230258-a675ac48af67 h1:BKg03K4me3EdM340RB08XB3MRlJ57KY+0f5PfI6wPZY=
Expand Down
8 changes: 7 additions & 1 deletion pkg/hal/cli/component/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,13 @@ func (o *pushOptions) push(component *component.Component) error {
return err
}

if err = c.ExecCommand(podName, []string{"/var/lib/supervisord/bin/supervisord", "ctl", "start", "build"}, "Performing build"); err != nil {
// need to stop running app before building a new version
if err = c.ExecCommand(podName, []string{"/var/lib/supervisord/bin/supervisord", "ctl", "stop", "run"}, ""); err != nil {
return err
}

// perform build directly to block until it's finished
if err = c.ExecCommand(podName, []string{"/usr/local/bin/build"}, "Performing build"); err != nil {
return err
}
}
Expand Down