Kaynağa Gözat

updating tilt-create (#2968)

Stefan McShane 3 yıl önce
ebeveyn
işleme
c8270f3670
3 değiştirilmiş dosya ile 11 ekleme ve 27 silme
  1. 9 19
      Tiltfile
  2. 2 1
      zarf/docker/Dockerfile.server.tilt
  3. 0 7
      zarf/helm/.serverenv

+ 9 - 19
Tiltfile

@@ -62,12 +62,19 @@ local_resource(
   labels=["z_binaries"]
 )
 
+local_resource(
+    name="migrations-binary",
+    cmd='''GOWORK=off CGO_ENABLED=0 %s go build -mod vendor -gcflags '-N -l' -tags ee -o ./bin/migrate ./cmd/migrate/main.go ./cmd/migrate/migrate_ee.go''' % build_args,
+    resource_deps=["postgresql"],
+    labels=["z_binaries"],
+)
+
 docker_build_with_restart(
     ref="porter1/porter-server",
     context=".",
     dockerfile="zarf/docker/Dockerfile.server.tilt",
     # entrypoint='dlv --listen=:40000 --api-version=2 --headless=true --log=true exec /porter/bin/app',
-    entrypoint='/app/porter',
+    entrypoint='/app/migrate && /app/porter',
     build_args={},
     only=[
         "bin",
@@ -75,7 +82,7 @@ docker_build_with_restart(
     live_update=[
         sync('./bin/porter', '/app/'),
         sync('./bin/migrate', '/app/'),
-    ], 
+    ]
 ) 
 
 local_resource(
@@ -101,20 +108,3 @@ local_resource(
 )
 # local_resource('public-url', serve_cmd='lt --subdomain "$(whoami)" --port 8080', resource_deps=["porter-dashboard"], labels=["porter"])
 # local_resource('public-url', serve_cmd='ngrok http 8081 --log=stdout', resource_deps=["porter-dashboard"], labels=["porter"])
-
-# Migrations
-local_resource(
-    name="migrations-binary",
-    cmd='''GOWORK=off CGO_ENABLED=0 %s go build -mod vendor -gcflags '-N -l' -tags ee -o ./bin/migrate ./cmd/migrate/main.go ./cmd/migrate/migrate_ee.go''' % build_args,
-    resource_deps=["postgresql"],
-    labels=["z_binaries"],
-)
-local_resource(
-    name="run-migrations",
-    cmd='''kubectl exec -it deploy/porter-server-web -- /app/migrate''',
-    resource_deps=["migrations-binary", "porter-binary", "porter-server-web", "postgresql"],
-    deps=["postgresql"],
-    labels=["porter"],
-    trigger_mode=TRIGGER_MODE_MANUAL,
-    auto_init=False
-)

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

@@ -7,4 +7,5 @@ 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 ./bin/porter /app
+COPY ./bin/porter /app
+COPY ./bin/migrate /app

+ 0 - 7
zarf/helm/.serverenv

@@ -1,7 +1,6 @@
 # Fill out this file, and renamed to '.server.env' in order to run this with Tilt
 
 # Required parameters
-
 SQL_LITE=false
 DB_NAME=porter
 DB_USER=porter
@@ -10,17 +9,14 @@ DB_HOST=postgresql
 DB_PORT=5432
 
 # Required for accessing cluster control plane. If ENABLE_CAPI_PROVISIONER=false, nothing in this section will be used
-
 ENABLE_CAPI_PROVISIONER=false
 NATS_URL=nats:4222
 CLUSTER_CONTROL_PLANE_ADDRESS=http://ccp-web:7833
 
 # Github Login OAuth
-
 GITHUB_LOGIN_ENABLED=false
 
 # Github App for repo deployments, and preview environments. Remove these if you are not using preview environments or deploying from a repo locally
-
 GITHUB_APP_CLIENT_ID=<github_app_id>
 GITHUB_APP_CLIENT_SECRET=<github_secret>
 GITHUB_APP_WEBHOOK_SECRET=<webhook_secret>
@@ -28,14 +24,11 @@ GITHUB_APP_NAME=<github_app_name>
 GITHUB_APP_ID=<github_app_id>
 
 # GITHUB_APP_SECRET_PATH is the path to your secret within the container. Tilt will sync your ~/.ssh/ folder into /app/ssh automatically. This will likely be /app/ssh/your_ssh_pem_name
-
 GITHUB_APP_SECRET_PATH=<path_to_secret>
 
 # Optional parameters
-
 HELM_APP_REPO_URL=https://charts.getporter.dev
 HELM_ADD_ON_REPO_URL=https://charts.getporter.dev
 
 # SERVER_URL must be set to your ngrok url, If you are using ngrok for your github app setup on the backend
-
 # SERVER_URL=