Compare commits
1 Commits
4d7fed6331
...
92fbf686bd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92fbf686bd |
@ -484,7 +484,7 @@ func (svc *Service) runBuildAndDeploy(
|
|||||||
svc.notify.NotifyBuildSuccess(bgCtx, app, deployment)
|
svc.notify.NotifyBuildSuccess(bgCtx, app, deployment)
|
||||||
|
|
||||||
// Deploy phase with timeout
|
// Deploy phase with timeout
|
||||||
err = svc.deployContainerWithTimeout(deployCtx, app, deployment, imageID)
|
err = svc.deployContainerWithTimeout(deployCtx, app, deployment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cancelErr := svc.checkCancelled(deployCtx, bgCtx, app, deployment, imageID)
|
cancelErr := svc.checkCancelled(deployCtx, bgCtx, app, deployment, imageID)
|
||||||
if cancelErr != nil {
|
if cancelErr != nil {
|
||||||
@ -541,7 +541,6 @@ func (svc *Service) deployContainerWithTimeout(
|
|||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
app *models.App,
|
app *models.App,
|
||||||
deployment *models.Deployment,
|
deployment *models.Deployment,
|
||||||
imageID string,
|
|
||||||
) error {
|
) error {
|
||||||
deployCtx, cancel := context.WithTimeout(ctx, deployTimeout)
|
deployCtx, cancel := context.WithTimeout(ctx, deployTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
@ -555,7 +554,7 @@ func (svc *Service) deployContainerWithTimeout(
|
|||||||
svc.removeOldContainer(deployCtx, app, deployment)
|
svc.removeOldContainer(deployCtx, app, deployment)
|
||||||
|
|
||||||
// Create and start the new container
|
// Create and start the new container
|
||||||
_, err = svc.createAndStartContainer(deployCtx, app, deployment, imageID)
|
_, err = svc.createAndStartContainer(deployCtx, app, deployment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(deployCtx.Err(), context.DeadlineExceeded) {
|
if errors.Is(deployCtx.Err(), context.DeadlineExceeded) {
|
||||||
timeoutErr := fmt.Errorf("%w after %v", ErrDeployTimeout, deployTimeout)
|
timeoutErr := fmt.Errorf("%w after %v", ErrDeployTimeout, deployTimeout)
|
||||||
@ -1018,7 +1017,6 @@ func (svc *Service) createAndStartContainer(
|
|||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
app *models.App,
|
app *models.App,
|
||||||
deployment *models.Deployment,
|
deployment *models.Deployment,
|
||||||
_ string,
|
|
||||||
) (string, error) {
|
) (string, error) {
|
||||||
containerOpts, err := svc.buildContainerOptions(ctx, app, deployment.ID)
|
containerOpts, err := svc.buildContainerOptions(ctx, app, deployment.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user