Compare commits
1 Commits
92fbf686bd
...
4d7fed6331
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d7fed6331 |
@ -555,7 +555,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 +1018,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