Pull images before trying to run them

apppackio · Apr 8, 2023 · 7b37bf3 · 7b37bf3
1 parent 942f283
commit 7b37bf3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/builder/build/prebuild.go b/builder/build/prebuild.go
@@ -335,16 +335,24 @@ func (b *Build) StartAddons() (map[string]string, error) {
 	var err error
 	// dedupe addons
 	addons := removeDuplicateStr(b.AppJSON.GetTestAddons())
+	redisImage := "redis:alpine"
+	postgresImage := "postgres:alpine"
 	// use a switch statement to iterate over addons
 	for _, addon := range addons {
 		switch addon {
 		case "heroku-redis:in-dyno":
-			if err = b.containers.RunContainer("redis", b.CodebuildBuildId, &container.Config{Image: "redis:alpine"}); err != nil {
+			if err = b.containers.PullImage(redisImage); err != nil {
+				return nil, err
+			}
+			if err = b.containers.RunContainer("redis", b.CodebuildBuildId, &container.Config{Image: redisImage}); err != nil {
 				return nil, err
 			}
 			envOverides["REDIS_URL"] = "redis://redis:6379"
 		case "heroku-postgresql:in-dyno":
-			if err = b.containers.RunContainer("db", b.CodebuildBuildId, &container.Config{Image: "postgres:alpine"}); err != nil {
+			if err = b.containers.PullImage(postgresImage); err != nil {
+				return nil, err
+			}
+			if err = b.containers.RunContainer("db", b.CodebuildBuildId, &container.Config{Image: postgresImage}); err != nil {
 				return nil, err
 			}
 			envOverides["DATABASE_URL"] = "postgres://postgres:postgres@db:5432/postgres"

diff --git a/builder/build/prebuild_test.go b/builder/build/prebuild_test.go
@@ -515,10 +515,18 @@ func TestRemoveDuplicateStr(t *testing.T) {
 
 func TestStartAddons(t *testing.T) {
 	mockedContainers := new(MockContainers)
+	mockedContainers.On(
+		"PullImage",
+		"redis:alpine",
+	).Return(nil)
 	mockedContainers.On(
 		"RunContainer",
 		"redis", CodebuildBuildId, &container.Config{Image: "redis:alpine"},
 	).Return(nil)
+	mockedContainers.On(
+		"PullImage",
+		"postgres:alpine",
+	).Return(nil)
 	mockedContainers.On(
 		"RunContainer",
 		"db", CodebuildBuildId, &container.Config{Image: "postgres:alpine"},