Răsfoiți Sursa

updated gitignore from master

Stefan McShane 3 ani în urmă
părinte
comite
85977135df
3 a modificat fișierele cu 6 adăugiri și 9 ștergeri
  1. 0 2
      .gitignore
  2. 5 6
      Tiltfile
  3. 1 1
      zarf/docker/Dockerfile.server.tilt

+ 0 - 2
.gitignore

@@ -21,8 +21,6 @@ openapi.yaml
 vendor
 **/*.env
 **/node_modules
-migrate-binary
-porter-binary
 zarf/helm/charts
 
 # Local docs directories

+ 5 - 6
Tiltfile

@@ -15,7 +15,7 @@ if config.tilt_subcommand == "down":
 ## Build binary locally for faster devexp
 local_resource(
   name='porter-binary',
-  cmd='''GOWORK=off CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod vendor -gcflags '-N -l' -tags ee -o ./porter-binary ./cmd/app/main.go''',
+  cmd='''GOWORK=off CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod vendor -gcflags '-N -l' -tags ee -o ./bin/porter ./cmd/app/main.go''',
   deps=[
     "api",
     "build",
@@ -36,12 +36,11 @@ docker_build_with_restart(
     entrypoint='/app/porter',
     build_args={},
     only=[
-        "porter",
-        "migrate"
+        "bin",
     ],
     live_update=[
-        sync('./porter', '/app/'),
-        sync('./migrate', '/app/'),
+        sync('./bin/porter', '/app/'),
+        sync('./bin/migrate', '/app/'),
     ], 
 ) 
 
@@ -63,7 +62,7 @@ local_resource(
 # Migrations
 local_resource(
     name="migrations-binary",
-    cmd='''GOWORK=off CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod vendor -gcflags '-N -l' -tags ee -o ./migrate-binary ./cmd/migrate/main.go ./cmd/migrate/migrate_ee.go''',
+    cmd='''GOWORK=off CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod vendor -gcflags '-N -l' -tags ee -o ./bin/migrate ./cmd/migrate/main.go ./cmd/migrate/migrate_ee.go''',
     resource_deps=["postgresql"],
     labels=["porter"],
 )

+ 1 - 1
zarf/docker/Dockerfile.server.tilt

@@ -7,4 +7,4 @@ FROM debian:bullseye-slim as runner
 WORKDIR /app
 COPY --from=installer /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=installer /go/bin/dlv /
-COPY ./porter /app
+COPY ./bin/porter /app