diff --git a/apps/webapp/cypress.config.ts b/apps/webapp/cypress.config.ts deleted file mode 100644 index 0c2ba26fb..000000000 --- a/apps/webapp/cypress.config.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { defineConfig } from "cypress"; - -export default defineConfig({ - e2e: { - setupNodeEvents: (on, config) => { - const isDev = config.watchForFileChanges; - const port = process.env.REMIX_APP_PORT ?? (isDev ? "3000" : "8811"); - const configOverrides: Partial = { - baseUrl: `http://localhost:${port}`, - video: !process.env.CI, - screenshotOnRunFailure: !process.env.CI, - }; - - // To use this: - // cy.task('log', whateverYouWantInTheTerminal) - on("task", { - log: (message) => { - console.log("cypress.config.ts:", message); - - return null; - }, - }); - - return { ...config, ...configOverrides }; - }, - }, -}); diff --git a/deploy/fly.toml b/deploy/fly.toml index e80617fb3..b489c09a3 100644 --- a/deploy/fly.toml +++ b/deploy/fly.toml @@ -1,4 +1,4 @@ -# fly.toml app configuration file generated for trigger-v2-fly-demo on 2023-06-22T14:44:12+01:00 +# fly.toml app configuration file generated for trigger-v2-fly-demo on 2023-06-22T16:23:19+01:00 # # See https://fly.io/docs/reference/configuration/ for information about how to use this file. # @@ -6,15 +6,15 @@ app = "trigger-v2-fly-demo" primary_region = "lhr" -[env] -PRIMARY_REGION = "lhr" - [build] image = "ghcr.io/triggerdotdev/trigger.dev:latest" +[env] + PRIMARY_REGION = "lhr" + [http_service] internal_port = 3000 force_https = true auto_stop_machines = true auto_start_machines = true - min_machines_running = 0 \ No newline at end of file + min_machines_running = 0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 2413d9641..308547c37 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -61,4 +61,6 @@ COPY --from=builder /triggerdotdev/apps/webapp/build ./apps/webapp/build COPY --from=builder /triggerdotdev/apps/webapp/public ./apps/webapp/public COPY --from=builder /triggerdotdev/scripts ./scripts +EXPOSE 3000 + CMD ["./scripts/entrypoint.sh"] \ No newline at end of file