epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure instance client is ready before provisioning stack

Browse Source 
Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
This commit is contained in:
Marcos Lilljedahl
2024-01-12 11:15:53 -03:00
parent 4c099ab398
commit a07bc20f06
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pwd/session.go
View File

@@ -143,7 +143,6 @@ func (p *pwd) SessionClose(s *types.Session) error {
p.setGauges() p.setGauges()
p.event.Emit(event.SESSION_END, s.Id) p.event.Emit(event.SESSION_END, s.Id)
return nil return nil
} }
func (p *pwd) SessionGetSmallestViewPort(sessionId string) types.ViewPort { func (p *pwd) SessionGetSmallestViewPort(sessionId string) types.ViewPort {
@@ -214,6 +213,11 @@ func (p *pwd) SessionDeployStack(s *types.Session) error {
return err return err
} }
if _, err := p.dockerFactory.GetForInstance(i); err != nil {
log.Printf("error retrieving docker client for new instance %v", err)
return err
}
code, err := dockerClient.ExecAttach(i.Name, []string{"sh", "-c", cmd}, &w) code, err := dockerClient.ExecAttach(i.Name, []string{"sh", "-c", cmd}, &w)
if err != nil { if err != nil {
log.Printf("Error executing stack [%s]: %s\n", s.Stack, err) log.Printf("Error executing stack [%s]: %s\n", s.Stack, err)
@@ -233,7 +237,6 @@ func (p *pwd) SessionGet(sessionId string) (*types.Session, error) {
defer observeAction("SessionGet", time.Now()) defer observeAction("SessionGet", time.Now())
s, err := p.storage.SessionGet(sessionId) s, err := p.storage.SessionGet(sessionId)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
return nil, err return nil, err