Compile and attach service configs when exporting docker image (#2208)

Author: ekerfelt

.gitignore

@@ -3,10 +3,12 @@
 /encore
 /git-remote-encore
 /target
+/__debug_*
 
 # Don't commit dotfiles
 /.encore
 /.vscode
+/.zed
 
 # Build artifact that must be placed alongside go files for Windows
 *.syso

cli/daemon/export/export.go

@@ -2,9 +2,11 @@ package export
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/cockroachdb/errors"
@@ -76,21 +78,6 @@ func Docker(ctx context.Context, app *apps.Instance, req *daemonpb.ExportRequest
 		return false, errors.Wrap(err, "cache metadata")
 	}
 
-	// Validate the service configs.
-	_, err = bld.ServiceConfigs(ctx, builder.ServiceConfigsParams{
-		Parse: parse,
-		CueMeta: &cueutil.Meta{
-			// Dummy data to satisfy config validation.
-			APIBaseURL: "http://localhost:0",
-			EnvName:    "encore-eject",
-			EnvType:    cueutil.EnvType_Development,
-			CloudType:  cueutil.CloudType_Local,
-		},
-	})
-	if err != nil {
-		return false, err
-	}
-
 	log.Info().Msgf("compiling Encore application for %s/%s", req.Goos, req.Goarch)
 	result, err := bld.Compile(ctx, builder.CompileParams{
 		Build:       buildInfo,
@@ -192,6 +179,28 @@ func Docker(ctx context.Context, app *apps.Instance, req *daemonpb.ExportRequest
 		}
 		spec.WriteFiles[defaultInfraConfigPath] = data
 		spec.Env = append(spec.Env, fmt.Sprintf("ENCORE_INFRA_CONFIG_PATH=%s", defaultInfraConfigPath))
+
+		// Validate the service configs.
+		cfgs, err := bld.ServiceConfigs(ctx, builder.ServiceConfigsParams{
+			Parse: parse,
+			CueMeta: &cueutil.Meta{
+				APIBaseURL: cfg.Metadata.BaseURL,
+				EnvName:    cfg.Metadata.EnvName,
+				EnvType:    orDefault(cueutil.EnvType(cfg.Metadata.EnvType), "development"),
+				CloudType:  orDefault(cueutil.CloudType(cfg.Metadata.Cloud), "local"),
+			},
+		})
+		if err != nil {
+			return false, err
+		}
+		for svcName, cfgStr := range cfgs.Configs {
+			spec.Env = append(spec.Env, fmt.Sprintf(
+				"%s%s=%s",
+				"ENCORE_CFG_",
+				strings.ToUpper(svcName),
+				base64.RawURLEncoding.EncodeToString([]byte(cfgStr)),
+			))
+		}
 	}
 	var baseImgOverride option.Option[v1.Image]
 	if params.BaseImageTag != "" {
@@ -253,6 +262,14 @@ func Docker(ctx context.Context, app *apps.Instance, req *daemonpb.ExportRequest
 	return true, nil
 }
 
+func orDefault[T comparable](value T, defaultValue T) T {
+	var zero T
+	if value == zero {
+		return defaultValue
+	}
+	return value
+}
+
 func resolveBaseImage(ctx context.Context, log zerolog.Logger, p *daemonpb.DockerExportParams, spec *dockerbuild.ImageSpec) (v1.Image, error) {
 	baseImgTag := p.BaseImageTag
 	if baseImgTag == "" || baseImgTag == "scratch" {

v2/v2builder/v2builder.go

@@ -221,7 +221,7 @@ func (*BuilderImpl) ServiceConfigs(ctx context.Context, p builder.ServiceConfigs
 
 	pd := p.Parse.Data.(*parseData)
 	cfg := computeConfigs(pd.pc.Errs, pd.appDesc, pd.mainModule, p.CueMeta)
-	if err != nil {
+	if err := pd.pc.Errs.AsError(); err != nil {
 		return nil, err
 	}
 	return &builder.ServiceConfigsResult{