diff --git a/apps/api/docker-entrypoint.sh b/apps/api/docker-entrypoint.sh index 0e8d72bb..6b09e705 100755 --- a/apps/api/docker-entrypoint.sh +++ b/apps/api/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -if [ $UID -eq 0 ]; then +if [ "$UID" -eq 0 ]; then set +e # disable failing on errror ulimit -n 65535 echo "NEW ULIMIT: $(ulimit -n)" @@ -9,13 +9,13 @@ else echo ENTRYPOINT DID NOT RUN AS ROOT fi -if [ $FLY_PROCESS_GROUP = "app" ]; then +if [ "$FLY_PROCESS_GROUP" = "app" ]; then echo "RUNNING app" node --max-old-space-size=8192 dist/src/index.js -elif [ $FLY_PROCESS_GROUP = "worker" ]; then +elif [ "$FLY_PROCESS_GROUP" = "worker" ]; then echo "RUNNING worker" node --max-old-space-size=8192 dist/src/services/queue-worker.js -elif [ $FLY_PROCESS_GROUP = "index-worker" ]; then +elif [ "$FLY_PROCESS_GROUP" = "index-worker" ]; then echo "RUNNING index worker" node --max-old-space-size=8192 dist/src/services/indexing/index-worker.js else diff --git a/examples/kubernetes/cluster-install/README.md b/examples/kubernetes/cluster-install/README.md index 6febc616..126c638d 100644 --- a/examples/kubernetes/cluster-install/README.md +++ b/examples/kubernetes/cluster-install/README.md @@ -12,12 +12,12 @@ 2. Build Docker images, and host it in your Docker Registry (replace the target registry with your own) 1. API (which is also used as a worker image) 1. ```bash - docker build --no-cache -t ghcr.io/winkk-dev/firecrawl:latest ../../../apps/api + docker build --no-cache --platform linux/amd64 -t ghcr.io/winkk-dev/firecrawl:latest ../../../apps/api docker push ghcr.io/winkk-dev/firecrawl:latest ``` 2. Playwright 1. ```bash - docker build --no-cache -t ghcr.io/winkk-dev/firecrawl-playwright:latest ../../../apps/playwright-service + docker build --no-cache --platform linux/amd64 -t ghcr.io/winkk-dev/firecrawl-playwright:latest ../../../apps/playwright-service docker push ghcr.io/winkk-dev/firecrawl-playwright:latest ``` 3. Replace the image in [worker.yaml](worker.yaml), [api.yaml](api.yaml) and [playwright-service.yaml](playwright-service.yaml) diff --git a/examples/kubernetes/cluster-install/api.yaml b/examples/kubernetes/cluster-install/api.yaml index 54ecfbf6..c860e4b6 100644 --- a/examples/kubernetes/cluster-install/api.yaml +++ b/examples/kubernetes/cluster-install/api.yaml @@ -21,11 +21,14 @@ spec: args: [ "pnpm", "run", "start:production" ] ports: - containerPort: 3002 + env: + - name: FLY_PROCESS_GROUP + value: "app" envFrom: - configMapRef: name: firecrawl-config - #- secretRef: - # name: firecrawl-secret + - secretRef: + name: firecrawl-secret livenessProbe: httpGet: path: /v0/health/liveness diff --git a/examples/kubernetes/cluster-install/configmap.yaml b/examples/kubernetes/cluster-install/configmap.yaml index b56cfbcd..5796fe82 100644 --- a/examples/kubernetes/cluster-install/configmap.yaml +++ b/examples/kubernetes/cluster-install/configmap.yaml @@ -8,6 +8,6 @@ data: HOST: "0.0.0.0" REDIS_URL: "redis://redis:6379" REDIS_RATE_LIMIT_URL: "redis://redis:6379" - PLAYWRIGHT_MICROSERVICE_URL: "http://playwright-service:3000/html" + PLAYWRIGHT_MICROSERVICE_URL: "http://playwright-service:3000" USE_DB_AUTHENTICATION: "false" HDX_NODE_BETA_MODE: "1" diff --git a/examples/kubernetes/cluster-install/worker.yaml b/examples/kubernetes/cluster-install/worker.yaml index 8e992cf1..e2d31ebc 100644 --- a/examples/kubernetes/cluster-install/worker.yaml +++ b/examples/kubernetes/cluster-install/worker.yaml @@ -19,8 +19,11 @@ spec: image: ghcr.io/winkk-dev/firecrawl:latest imagePullPolicy: Always args: [ "pnpm", "run", "workers" ] + env: + - name: FLY_PROCESS_GROUP + value: "worker" envFrom: - configMapRef: name: firecrawl-config - #- secretRef: - # name: firecrawl-secret + - secretRef: + name: firecrawl-secret