From d01a911912d6cc6e60fd34f726f9c721fce590ca Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Tue, 4 Feb 2025 15:54:10 -0800
Subject: [PATCH] fix fly deploy

---
 .dockerignore                                 |  8 ++++
 .../workflows/fly-deploy.yml                  |  3 +-
 packages/playground/Dockerfile => Dockerfile  |  2 +-
 fly.toml                                      | 43 +++++++++++++++++++
 packages/playground/fly.toml                  | 25 -----------
 5 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 .dockerignore
 rename {packages/playground/.github => .github}/workflows/fly-deploy.yml (76%)
 rename packages/playground/Dockerfile => Dockerfile (93%)
 create mode 100644 fly.toml
 delete mode 100644 packages/playground/fly.toml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..15c2af64b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+**/target
+**/dist
+LICENSES
+LICENSE
+temp
+README.md
+
+dx-debian
diff --git a/packages/playground/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
similarity index 76%
rename from packages/playground/.github/workflows/fly-deploy.yml
rename to .github/workflows/fly-deploy.yml
index b0c246ede..b97ed412a 100644
--- a/packages/playground/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -9,10 +9,11 @@ jobs:
   deploy:
     name: Deploy app
     runs-on: ubuntu-latest
-    concurrency: deploy-group    # optional: ensure only one action runs at a time
+    concurrency: deploy-group # optional: ensure only one action runs at a time
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
+      - working-directory: packages/playground
       - run: flyctl deploy --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/packages/playground/Dockerfile b/Dockerfile
similarity index 93%
rename from packages/playground/Dockerfile
rename to Dockerfile
index 67c6da585..c09df4f73 100644
--- a/packages/playground/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ RUN set -ex; \
 FROM pre-runtime AS runtime
 
 COPY --from=builder /app/target/release/server /usr/local/bin
-COPY --from=builder /app/server/template /usr/local/bin/template
+COPY --from=builder /app/packages/playground/server/template /usr/local/bin/template
 COPY --from=planner /.cargo/bin/dx /usr/local/bin
 
 ENV PATH="${PATH}:/usr/local/bin"
diff --git a/fly.toml b/fly.toml
new file mode 100644
index 000000000..ca188cf37
--- /dev/null
+++ b/fly.toml
@@ -0,0 +1,43 @@
+# fly.toml app configuration file generated for docsite-playground on 2025-02-04T15:44:00-08:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'docsite-playground'
+primary_region = 'lax'
+kill_signal = 'SIGINT'
+kill_timeout = '5s'
+
+[build]
+
+[http_service]
+  internal_port = 8080
+  force_https = true
+  auto_stop_machines = 'stop'
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ['app']
+
+[[services]]
+  protocol = 'tcp'
+  internal_port = 8080
+  processes = ['app']
+
+  [[services.ports]]
+    port = 80
+    handlers = ['http']
+    force_https = true
+
+  [[services.ports]]
+    port = 443
+    handlers = ['tls', 'http']
+
+  [services.concurrency]
+    type = 'connections'
+    hard_limit = 25
+    soft_limit = 20
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1
diff --git a/packages/playground/fly.toml b/packages/playground/fly.toml
deleted file mode 100644
index 32df72d8d..000000000
--- a/packages/playground/fly.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-# fly.toml file generated for docsite-playground on 2024-07-01T15:31:13-07:00
-
-app = "docsite-playground"
-kill_signal = "SIGINT"
-kill_timeout = 5
-mounts = []
-processes = []
-
-[[services]]
-  internal_port = 8080
-  processes = ["app"]
-  protocol = "tcp"
-  [services.concurrency]
-    hard_limit = 25
-    soft_limit = 20
-    type = "connections"
-
-  [[services.ports]]
-    force_https = true
-    handlers = ["http"]
-    port = 80
-
-  [[services.ports]]
-    handlers = ["tls", "http"]
-    port = 443