From 742717e6d779beec00c04f04d5dbc1ba0e1f28a7 Mon Sep 17 00:00:00 2001 From: Oleg Isonen Date: Sat, 21 May 2022 19:56:12 +0200 Subject: [PATCH] setting up fly --- Dockerfile | 11 ++++------- fly-toml => fly.toml | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename fly-toml => fly.toml (96%) diff --git a/Dockerfile b/Dockerfile index 6c10e08696..73af42cdd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ FROM base as deps WORKDIR /myapp -ADD package.json package-lock.json ./ -RUN npm install --production=false +ADD package.json yarn.lock ./ +RUN yarn # Setup production node_modules FROM base as production-deps @@ -21,7 +21,7 @@ FROM base as production-deps WORKDIR /myapp COPY --from=deps /myapp/node_modules /myapp/node_modules -ADD package.json package-lock.json ./ +ADD package.json yarn.lock ./ RUN npm prune --production # Build the app @@ -31,11 +31,8 @@ WORKDIR /myapp COPY --from=deps /myapp/node_modules /myapp/node_modules -ADD prisma . -RUN npx prisma generate - ADD . . -RUN npm run build +RUN yarn build # Finally, build the production image with minimal footprint FROM base diff --git a/fly-toml b/fly.toml similarity index 96% rename from fly-toml rename to fly.toml index 5b1e98d9d0..75e3cb56b8 100644 --- a/fly-toml +++ b/fly.toml @@ -1,4 +1,4 @@ -app = "webstudio.is" +app = "webstudio-dev" kill_signal = "SIGINT" kill_timeout = 5 diff --git a/package.json b/package.json index 29d896eac9..8445100347 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "build": "remix build", "dev": "node -r dotenv/config node_modules/.bin/remix dev", - "postinstall": "remix setup node && yarn migrate && yarn generate", + "prepare": "remix setup node && yarn migrate && yarn generate", "typecheck": "tsc -b", "lint": "eslint . --ext .ts,.tsx --max-warnings 0", "test": "jest",