Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4031df9

Browse filesBrowse files
Merge branch 'faster-stop-container' into 'master'
feat: faster container stop (force stop) See merge request postgres-ai/database-lab!83
2 parents 065622c + cbaee81 commit 4031df9
Copy full SHA for 4031df9

File tree

2 files changed

+4
-9
lines changed
Filter options

2 files changed

+4
-9
lines changed

‎pkg/services/provision/databases/postgres/postgres.go

Copy file name to clipboardExpand all lines: pkg/services/provision/databases/postgres/postgres.go
+3-8Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const (
4444

4545
// Start starts Postgres instance.
4646
func Start(r runners.Runner, c *resources.AppConfig) error {
47-
log.Dbg("Starting Postgres...")
47+
log.Dbg("Starting Postgres container...")
4848

4949
err := Configure(c)
5050
if err != nil {
@@ -196,14 +196,9 @@ func Configure(c *resources.AppConfig) error {
196196

197197
// Stop stops Postgres instance.
198198
func Stop(r runners.Runner, c *resources.AppConfig) error {
199-
log.Dbg("Stopping Postgres...")
199+
log.Dbg("Stopping Postgres container...")
200200

201-
_, err := docker.StopContainer(r, c)
202-
if err != nil {
203-
return errors.Wrap(err, "failed to stop container")
204-
}
205-
206-
_, err = docker.RemoveContainer(r, c)
201+
_, err := docker.RemoveContainer(r, c)
207202
if err != nil {
208203
return errors.Wrap(err, "failed to remove container")
209204
}

‎pkg/services/provision/docker/docker.go

Copy file name to clipboardExpand all lines: pkg/services/provision/docker/docker.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func StopContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
4343

4444
// RemoveContainer removes specified container.
4545
func RemoveContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
46-
dockerRemoveCmd := "docker container rm " + c.CloneName
46+
dockerRemoveCmd := "docker container rm --force " + c.CloneName
4747

4848
return r.Run(dockerRemoveCmd, true)
4949
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.