@evolu/relay 1.1.2-preview.1 → 1.1.2-preview.2

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @evolu/relay@1.1.2-preview.1 build /home/runner/work/evolu/evolu/apps/relay
+> @evolu/relay@1.1.2-preview.2 build /home/runner/work/evolu/evolu/apps/relay
 > shx rm -rf dist && tsc
 

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # server
 
+## 1.1.2-preview.2
+
+### Patch Changes
+
+- cc08e11: add shebang to CLI script
+
 ## 1.1.2-preview.1
 
 ### Patch Changes

package/Dockerfile

@@ -1,66 +1,25 @@
-FROM node:22-alpine AS base
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
+FROM node:22-alpine
 
-FROM base AS builder
-RUN apk update && apk add --no-cache libc6-compat
-WORKDIR /app
-RUN corepack enable pnpm
-RUN pnpm install -g turbo
-COPY . .
-
-# Generate a partial monorepo with a pruned lockfile for the relay workspace
-RUN turbo prune @evolu/relay --docker
-
-# ------------------------------------------------------------
-# Installer stage - build the pruned workspace
-FROM base AS installer
-RUN apk update && apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Install pnpm and turbo
-RUN corepack enable pnpm
-RUN pnpm install -g turbo
+# Install required dependencies and create non-root user
+RUN apk add --no-cache wget && \
+    addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 evolu --ingroup nodejs && \
+    npm install -g @evolu/relay@latest && \
+    mkdir -p /app/data && \
+    chown -R evolu:nodejs /app
 
-# Install dependencies from pruned lockfile
-COPY --from=builder /app/out/json/ .
-RUN pnpm install --frozen-lockfile
-
-# Copy source and build
-COPY --from=builder /app/out/full/ .
-# Ensure README.md is available at the root for the build process
-COPY --from=builder /app/README.md ./README.md
-RUN turbo run build
-
-# ------------------------------------------------------------
-# Runner stage - minimal runtime image
-FROM base AS runner
 WORKDIR /app
-
-# Create non-root user
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 evolu --ingroup nodejs
-RUN chown evolu:nodejs /app
 USER evolu
 
-# Copy built application
-COPY --from=installer --chown=evolu:nodejs /app/apps/relay/dist ./dist
-
-# Copy the complete node_modules with all dependencies
-COPY --from=installer --chown=evolu:nodejs /app/node_modules ./node_modules
-
-# Copy the built workspace packages that the relay needs at runtime
-COPY --from=installer --chown=evolu:nodejs /app/packages/common/dist ./node_modules/@evolu/common/dist
-COPY --from=installer --chown=evolu:nodejs /app/packages/common/package.json ./node_modules/@evolu/common/package.json
-COPY --from=installer --chown=evolu:nodejs /app/packages/nodejs/dist ./node_modules/@evolu/nodejs/dist
-COPY --from=installer --chown=evolu:nodejs /app/packages/nodejs/package.json ./node_modules/@evolu/nodejs/package.json
+ENV RELAY_PORT=4000 \
+    RELAY_NAME=evolu-relay \
+    RELAY_ENABLE_LOGGING=false \
+    NODE_ENV=production \
+    LOG_LEVEL=error
 
-# Expose port
-EXPOSE 4000
+EXPOSE ${RELAY_PORT}
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:4000 || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:${RELAY_PORT}
 
-# Start the application
-CMD ["node", "dist/index.js"] 
+CMD ["sh", "-c", "node /usr/local/lib/node_modules/@evolu/relay/dist/src/cli.js start --port $RELAY_PORT --name $RELAY_NAME $([ \"$RELAY_ENABLE_LOGGING\" = \"true\" ] && echo --enable-logging)"] 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evolu/relay",
-    "version": "1.1.2-preview.1",
+    "version": "1.1.2-preview.2",
     "type": "module",
     "bin": {
         "@evolu/relay": "dist/src/cli.js"
@@ -13,7 +13,7 @@
         "docker:build": "docker-compose build --no-cache",
         "docker:up": "docker-compose up --build",
         "docker:up:detached": "docker-compose up -d --build",
-        "docker:down": "docker-compose down",
+        "docker:down": "docker-compose down -v",
         "docker:restart": "docker-compose down && docker-compose up --build",
         "docker:logs": "docker-compose logs -f evolu-relay",
         "docker:shell": "docker exec -it evolu-relay-server sh",

package/dist/src/cli.d.ts

@@ -1,2 +1,3 @@
+#!/usr/bin/env node
 export {};
 //# sourceMappingURL=cli.d.ts.map

package/dist/src/cli.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import { Command, Option } from "commander";
 import packageJson from "../package.json" with { type: "json" };
 import { logger } from "./logger.js";

package/docker-compose.yml

@@ -3,19 +3,21 @@ services:
     container_name: evolu-relay-server
     image: evolu/relay:latest
     build:
-      context: ../../
-      dockerfile: apps/relay/Dockerfile
+      context: .
+      dockerfile: Dockerfile
       tags:
         - evolu/relay:latest
-        - evolu/relay:dev
     ports:
-      - "4000:4000"
+      - "${RELAY_PORT:-4000}:${RELAY_PORT:-4000}"
     volumes:
       # Use named volume by default, can be overridden with bind mount if needed
-      - evolu-relay-data:/app/apps/relay/data
+      - evolu-relay-data:/app/data
     environment:
       - NODE_ENV=${NODE_ENV:-production}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
+      - LOG_LEVEL=${LOG_LEVEL:-error}
+      - RELAY_NAME=${RELAY_NAME:-evolu-relay}
+      - RELAY_PORT=${RELAY_PORT:-4000}
+      - RELAY_ENABLE_LOGGING=${RELAY_ENABLE_LOGGING:-false}
     restart: unless-stopped
     deploy:
       resources:
@@ -29,9 +31,11 @@ services:
       test:
         [
           "CMD",
-          "sh",
-          "-c",
-          "wget --no-verbose --tries=1 --spider http://localhost:4000 2>&1 | grep -q '426 Upgrade Required' || exit 1",
+          "wget",
+          "--no-verbose",
+          "--tries=1",
+          "--spider",
+          "http://localhost:4000",
         ]
       interval: 30s
       timeout: 5s

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@evolu/relay",
-  "version": "1.1.2-preview.1",
+  "version": "1.1.2-preview.2",
   "type": "module",
   "bin": {
     "@evolu/relay": "dist/src/cli.js"
   },
   "dependencies": {
     "commander": "^14.0.1",
-    "@evolu/common": "6.0.1-preview.19",
-    "@evolu/nodejs": "1.0.1-preview.7"
+    "@evolu/nodejs": "1.0.1-preview.7",
+    "@evolu/common": "6.0.1-preview.19"
   },
   "devDependencies": {
     "@types/node": "^22.17.1",
@@ -29,7 +29,7 @@
     "docker:build": "docker-compose build --no-cache",
     "docker:up": "docker-compose up --build",
     "docker:up:detached": "docker-compose up -d --build",
-    "docker:down": "docker-compose down",
+    "docker:down": "docker-compose down -v",
     "docker:restart": "docker-compose down && docker-compose up --build",
     "docker:logs": "docker-compose logs -f evolu-relay",
     "docker:shell": "docker exec -it evolu-relay-server sh",

package/src/cli.ts

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import { Command, Option } from "commander";
 import packageJson from "../package.json" with { type: "json" };
 import { logger } from "./logger.js";