Switch postgres image (#4)

* Allow specifying introspector ref and skipping image pull. Useful for local development

* Switch to smaller official postgres image

Author: gsoltis

main.go

@@ -176,9 +176,11 @@ func serviceSpec(r resourceSpecMap) string {
 func main() {
 	pkger.Include("/templates")
 	pkger.Include("/queries")
-	var skipIntrospector, leavePostgresUp, reusePostgres, logIntrospector, printToStdOut bool
-	var outputDir string
+	var skipIntrospector, leavePostgresUp, reusePostgres, logIntrospector, printToStdOut, skipIntrospectorPull bool
+	var outputDir, introspectorRef string
 	flag.BoolVar(&skipIntrospector, "skip-introspector", false, "Skip running an import, use existing data")
+	flag.BoolVar(&skipIntrospectorPull, "skip-introspector-pull", false, "Skip pulling the introspector docker image. Allows for using a local image")
+	flag.StringVar(&introspectorRef, "introspector-ref", "", "Override the introspector docker image to use")
 	flag.BoolVar(&leavePostgresUp, "leave-postgres", false, "Leave postgres running in a docker container")
 	flag.BoolVar(&reusePostgres, "reuse-postgres", false, "Reuse an existing postgres instance, if it is running")
 	flag.BoolVar(&logIntrospector, "log-introspector", false, "Pass through logs from introspector docker image")
@@ -210,7 +212,11 @@ func main() {
 		if err != nil {
 			panic(err)
 		}
-		i, err := introspector.New(ds, postgresService, introspector.Options{LogDockerOutput: logIntrospector})
+		i, err := introspector.New(ds, postgresService, introspector.Options{
+			LogDockerOutput: logIntrospector,
+			SkipDockerPull:  skipIntrospectorPull,
+			InspectorRef:    introspectorRef,
+		})
 		if err != nil {
 			panic(err)
 		}

pkg/introspector/introspector.go

@@ -27,13 +27,24 @@ type Service struct {
 
 type Options struct {
 	LogDockerOutput bool
+	SkipDockerPull  bool
+	InspectorRef    string
+}
+
+func (o *Options) fillInDefaults() {
+	if o.InspectorRef == "" {
+		o.InspectorRef = introspectorRef
+	}
 }
 
 func New(s *ds.Session, postgresService ps.PostgresService, opts Options) (*Service, error) {
 	log.Info("Checking for introspector image")
-	err := s.RequireImage(introspectorRef)
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to get instrospector docker image")
+	opts.fillInDefaults()
+	if !opts.SkipDockerPull {
+		err := s.RequireImage(opts.InspectorRef)
+		if err != nil {
+			return nil, errors.Wrap(err, "Failed to get instrospector docker image")
+		}
 	}
 	service, err := createIntrospectorContainer(s, postgresService, opts)
 	if err != nil {
@@ -77,7 +88,7 @@ func createIntrospectorContainer(s *ds.Session, postgresService ps.PostgresServi
 		fmt.Sprintf("INTROSPECTOR_DB_PORT=%v", address.HostPort),
 	}
 	containerBody, err := s.Client.ContainerCreate(s.Ctx, &container.Config{
-		Image: introspectorRef,
+		Image: opts.InspectorRef,
 		Env:   envVars,
 	}, &container.HostConfig{
 		NetworkMode: "host",

pkg/postgres/postgres.go

@@ -61,7 +61,8 @@ func (dps *DockerPostgresService) Address() nat.PortBinding {
 }
 
 const postgresContainerName = "postgres-db"
-const defaultPostgresRef = "supabase/postgres:0.13.0"
+
+const defaultPostgresRef = "postgres:13-alpine"
 const defaultPostgresPort = 5432
 
 func (o *DockerPostgresOptions) fillInDefaults() {