From 67527fc8b5f90363e71f874ad4ec9f4ca71bd584 Mon Sep 17 00:00:00 2001 From: xHomu Date: Tue, 20 Aug 2024 14:05:13 -0700 Subject: [PATCH 1/2] Revert "use Depot builder for deployment" This reverts commit 7ed92cb3672e5c9b37911e399bb514c59e27d772. --- .github/workflows/fly-app.yml | 2 +- .github/workflows/fly-core.yml | 2 +- .github/workflows/fly-custom.yml | 2 +- .github/workflows/fly-home.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fly-app.yml b/.github/workflows/fly-app.yml index 3575eb0be..2a164bf68 100644 --- a/.github/workflows/fly-app.yml +++ b/.github/workflows/fly-app.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: superfly/flyctl-actions/setup-flyctl@master - - run: flyctl deploy --app "$APP_NAME" --depot + - run: flyctl deploy --app "$APP_NAME" --remote-only env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/fly-core.yml b/.github/workflows/fly-core.yml index 77a18c443..4c16036ce 100644 --- a/.github/workflows/fly-core.yml +++ b/.github/workflows/fly-core.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: superfly/flyctl-actions/setup-flyctl@master - - run: flyctl deploy --app "$APP_NAME" --config ./fly/fly.core.toml --depot + - run: flyctl deploy --app "$APP_NAME" --config ./fly/fly.core.toml --remote-only env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/fly-custom.yml b/.github/workflows/fly-custom.yml index 0d610b98c..6ff917303 100644 --- a/.github/workflows/fly-custom.yml +++ b/.github/workflows/fly-custom.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: superfly/flyctl-actions/setup-flyctl@master - - run: flyctl deploy --app "$APP_NAME"-db --config ./fly/fly.custom.toml --depot + - run: flyctl deploy --app "$APP_NAME"-db --config ./fly/fly.custom.toml --remote-only env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/fly-home.yml b/.github/workflows/fly-home.yml index eb7183b51..e5e5b78e5 100644 --- a/.github/workflows/fly-home.yml +++ b/.github/workflows/fly-home.yml @@ -15,6 +15,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: superfly/flyctl-actions/setup-flyctl@master - - run: flyctl deploy --config ./fly/fly.home.toml --depot + - run: flyctl deploy --config ./fly/fly.home.toml --remote-only env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} From 7f5f93db8adc855439c94bc4ca476dc3cef59a6b Mon Sep 17 00:00:00 2001 From: xHomu Date: Tue, 20 Aug 2024 14:15:00 -0700 Subject: [PATCH 2/2] bump to node v22 to fix FetchError TLS terminate error --- Dockerfile | 2 +- fly/core.Dockerfile | 2 +- fly/custom.Dockerfile | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f036d21f1..ad84b3a15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Adjust NODE_VERSION as desired -ARG NODE_VERSION=20.8.0 +ARG NODE_VERSION=22.6.0 FROM node:${NODE_VERSION}-alpine as base LABEL fly_launch_runtime="Mana" diff --git a/fly/core.Dockerfile b/fly/core.Dockerfile index 5018b1ead..7b541e4d5 100644 --- a/fly/core.Dockerfile +++ b/fly/core.Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Adjust NODE_VERSION as desired -ARG NODE_VERSION=20.8.0 +ARG NODE_VERSION=22.6.0 FROM node:${NODE_VERSION}-alpine as base LABEL fly_launch_runtime="Remix" diff --git a/fly/custom.Dockerfile b/fly/custom.Dockerfile index 4f0dd7926..11b7e6f5a 100644 --- a/fly/custom.Dockerfile +++ b/fly/custom.Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Adjust NODE_VERSION as desired -ARG NODE_VERSION=20.8.0 +ARG NODE_VERSION=22.6.0 FROM node:${NODE_VERSION}-alpine as base LABEL fly_launch_runtime="Payload" diff --git a/package.json b/package.json index 6bb980b4a..c1aea41a6 100644 --- a/package.json +++ b/package.json @@ -159,6 +159,6 @@ "typescript": "^5.4.3" }, "engines": { - "node": ">=18" + "node": ">=22" } }