From fef06dd0e36c2b495ee7132e233a32b0c7766f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 13 Jan 2025 12:09:25 +0100 Subject: [PATCH] fixup! docker build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- Dockerfile | 6 ++---- api/fly.toml | 6 ++---- backend/fly.toml | 14 +++++++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d999ce..b685966 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ # syntax = docker/dockerfile:1 -# Adjust NODE_VERSION as desired -ARG NODE_VERSION=20.8.1 -FROM node:${NODE_VERSION}-slim AS base +FROM node:22.13.0-slim AS base LABEL fly_launch_runtime="nodejs" @@ -31,7 +29,7 @@ COPY --link package-lock.json package.json ./ # See https://docs.docker.com/reference/dockerfile/#copy---parents COPY --link api/package.json ./api/ COPY --link db/package.json ./db/ -COPY --link observer/package.json ./observer/ +COPY --link backend/package.json ./backend/ RUN npm ci --workspaces diff --git a/api/fly.toml b/api/fly.toml index 92290f5..a2cd3c3 100644 --- a/api/fly.toml +++ b/api/fly.toml @@ -1,5 +1,3 @@ -# fly.toml file generated for spark on 2023-05-16T19:09:01+02:00 - app = "deal-observer-api" primary_region = "cdg" kill_signal = "SIGINT" @@ -11,7 +9,7 @@ PORT = "8080" HOST = "0.0.0.0" SENTRY_ENVIRONMENT = "production" REQUEST_LOGGING = "false" -NPM_CONFIG_WORKSPACE = "stats" +NPM_CONFIG_WORKSPACE = "api" [experimental] auto_rollback = true @@ -23,7 +21,7 @@ processes = ["app"] protocol = "tcp" script_checks = [] [services.concurrency] -# Remember to update PG Pool config option `max` in bin/spark-stats.js when changing `hard_limit`. +# Remember to update PG Pool config option `max` in bin/deal-observer-api.js changing `hard_limit`. hard_limit = 800 soft_limit = 600 type = "connections" diff --git a/backend/fly.toml b/backend/fly.toml index 49a2b2d..ee0509d 100644 --- a/backend/fly.toml +++ b/backend/fly.toml @@ -1,14 +1,14 @@ -app = "spark-observer" +app = "spark-observer-backend" primary_region = "cdg" [env] - SENTRY_ENVIRONMENT = "production" - NPM_CONFIG_WORKSPACE = "observer" +SENTRY_ENVIRONMENT = "production" +NPM_CONFIG_WORKSPACE = "backend" [deploy] - strategy = "rolling" - release_command = "npm run migrate --workspace db" +strategy = "rolling" +release_command = "npm run migrate --workspace db" [[restart]] - policy = "always" - retries = 10 +policy = "always" +retries = 10