From 3134eee354430652bf25e575ecaba0709a25b8fb Mon Sep 17 00:00:00 2001 From: Yury Kossakovsky Date: Mon, 15 Dec 2025 10:06:13 -0700 Subject: [PATCH] refactor: remove N8N_VERSION env variable, hardcode stable --- .env.example | 4 ---- Makefile | 16 ---------------- docker-compose.yml | 4 ---- n8n/Dockerfile.n8n | 3 +-- n8n/Dockerfile.runner | 3 +-- n8n/n8n-task-runners.json | 2 -- scripts/update_preview.sh | 4 ++-- 7 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.env.example b/.env.example index a5a719d..bb1e25c 100644 --- a/.env.example +++ b/.env.example @@ -187,10 +187,6 @@ RUN_N8N_IMPORT= # n8n configuration ############ -# n8n version (used for both n8n and task runner images) -# Update this when upgrading n8n to ensure runner version matches -N8N_VERSION=stable - # Number of n8n worker-runner pairs to generate. # Each worker gets its own dedicated task runner sidecar. # After changing, run: bash scripts/generate_n8n_workers.sh diff --git a/Makefile b/Makefile index 79c482f..822ba7e 100644 --- a/Makefile +++ b/Makefile @@ -58,25 +58,9 @@ doctor: switch-beta: git restore docker-compose.yml git checkout develop - @if [ -f .env ]; then \ - if grep -q '^N8N_VERSION=' .env; then \ - sed -i.bak 's/^N8N_VERSION=.*/N8N_VERSION=beta/' .env && rm -f .env.bak; \ - else \ - echo 'N8N_VERSION=beta' >> .env; \ - fi; \ - fi - @echo "N8N_VERSION set to beta" sudo bash ./scripts/update.sh switch-stable: git restore docker-compose.yml git checkout main - @if [ -f .env ]; then \ - if grep -q '^N8N_VERSION=' .env; then \ - sed -i.bak 's/^N8N_VERSION=.*/N8N_VERSION=stable/' .env && rm -f .env.bak; \ - else \ - echo 'N8N_VERSION=stable' >> .env; \ - fi; \ - fi - @echo "N8N_VERSION set to stable" sudo bash ./scripts/update.sh diff --git a/docker-compose.yml b/docker-compose.yml index 06e9d91..21cfea3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,8 +39,6 @@ x-n8n: &service-n8n context: ./n8n dockerfile: Dockerfile.n8n pull: true - args: - N8N_VERSION: ${N8N_VERSION:-stable} environment: &service-n8n-env DB_POSTGRESDB_DATABASE: postgres DB_POSTGRESDB_HOST: postgres @@ -116,8 +114,6 @@ x-n8n-worker-runner: &service-n8n-worker-runner context: ./n8n dockerfile: Dockerfile.runner pull: true - args: - N8N_VERSION: ${N8N_VERSION:-stable} environment: GENERIC_TIMEZONE: ${GENERIC_TIMEZONE:-America/New_York} N8N_RUNNERS_AUTH_TOKEN: ${N8N_RUNNERS_AUTH_TOKEN} diff --git a/n8n/Dockerfile.n8n b/n8n/Dockerfile.n8n index e95d41e..acd0107 100644 --- a/n8n/Dockerfile.n8n +++ b/n8n/Dockerfile.n8n @@ -1,5 +1,4 @@ -ARG N8N_VERSION=stable -FROM n8nio/n8n:${N8N_VERSION} +FROM n8nio/n8n:stable USER root RUN apk add --no-cache ffmpeg diff --git a/n8n/Dockerfile.runner b/n8n/Dockerfile.runner index 58d0afa..63a2a99 100644 --- a/n8n/Dockerfile.runner +++ b/n8n/Dockerfile.runner @@ -1,5 +1,4 @@ -ARG N8N_VERSION=stable -FROM n8nio/runners:${N8N_VERSION} +FROM n8nio/runners:stable USER root diff --git a/n8n/n8n-task-runners.json b/n8n/n8n-task-runners.json index 86185b2..1776982 100644 --- a/n8n/n8n-task-runners.json +++ b/n8n/n8n-task-runners.json @@ -18,7 +18,6 @@ "N8N_RUNNERS_TASK_TIMEOUT", "N8N_RUNNERS_MAX_CONCURRENCY", "N8N_SENTRY_DSN", - "N8N_VERSION", "ENVIRONMENT", "DEPLOYMENT_NAME", "HOME" @@ -44,7 +43,6 @@ "N8N_RUNNERS_TASK_TIMEOUT", "N8N_RUNNERS_MAX_CONCURRENCY", "N8N_SENTRY_DSN", - "N8N_VERSION", "ENVIRONMENT", "DEPLOYMENT_NAME" ], diff --git a/scripts/update_preview.sh b/scripts/update_preview.sh index 730bd3d..687ee70 100755 --- a/scripts/update_preview.sh +++ b/scripts/update_preview.sh @@ -79,8 +79,8 @@ check_image_update "caddy" "caddy:2-alpine" # Check n8n if profile is active if is_profile_active "n8n"; then log_subheader "n8n Services" - check_image_update "n8n" "docker.n8n.io/n8nio/n8n:${N8N_VERSION:-stable}" - check_image_update "n8n-runner" "n8nio/runners:${N8N_VERSION:-stable}" + check_image_update "n8n" "docker.n8n.io/n8nio/n8n:stable" + check_image_update "n8n-runner" "n8nio/runners:stable" fi # Check monitoring if profile is active