From 4ab081511b328085d6c7c9990da2abc1a6e920e1 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Sun, 24 Mar 2024 01:00:24 +0000 Subject: docker: Use external chrome docker container --- docker/Dockerfile | 9 --------- docker/Dockerfile.dev | 7 +------ docker/docker-compose.dev.yml | 9 +++++++++ docker/docker-compose.yml | 9 +++++++++ docker/start-chrome.sh | 7 ------- 5 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 docker/start-chrome.sh (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 2164dc77..05432cbe 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -72,19 +72,10 @@ RUN --mount=type=cache,id=pnpm_workers,target=/pnpm/store pnpm deploy --node-lin FROM --platform=$BUILDPLATFORM node:21-alpine AS workers WORKDIR /app -# Install chromium needed for puppeteer -RUN apk add --no-cache chromium runuser -ENV CHROME_PATH "/usr/bin/chromium-browser" -ENV BROWSER_EXECUTABLE_PATH "/app/start-chrome.sh" -ENV BROWSER_USER_DATA_DIR="/tmp/chrome" - COPY --from=workers_builder /prod apps/workers RUN corepack enable -ADD docker/start-chrome.sh . -RUN chmod +x start-chrome.sh - WORKDIR /app/apps/workers USER root diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 9a8de32b..cd15b20d 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,11 +1,6 @@ FROM node:21-alpine -RUN apk add --no-cache libc6-compat chromium runuser make g++ py3-pip linux-headers +RUN apk add --no-cache libc6-compat make g++ py3-pip linux-headers ENV PUPPETEER_SKIP_DOWNLOAD true -ENV CHROME_PATH "/usr/bin/chromium-browser" -ENV BROWSER_EXECUTABLE_PATH "/bin/start-chrome.sh" -ENV BROWSER_USER_DATA_DIR="/tmp/chrome" WORKDIR /app -ADD start-chrome.sh /bin -RUN chmod +x /bin/start-chrome.sh diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index d7cbbbf0..80547930 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -23,6 +23,14 @@ services: image: redis:7.2-alpine volumes: - redis:/data + chrome: + image: gcr.io/zenika-hub/alpine-chrome:100 + restart: unless-stopped + command: + - --no-sandbox + - --disable-gpu + - --remote-debugging-address=0.0.0.0 + - --remote-debugging-port=9222 meilisearch: image: getmeili/meilisearch:v1.6 volumes: @@ -37,6 +45,7 @@ services: environment: REDIS_HOST: redis MEILI_ADDR: http://meilisearch:7700 + BROWSER_WEB_URL: http://chrome:9222 DATA_DIR: /data # OPENAI_API_KEY: ... command: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 03cb5a82..51c564b8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,6 +18,14 @@ services: restart: unless-stopped volumes: - redis:/data + chrome: + image: gcr.io/zenika-hub/alpine-chrome:100 + restart: unless-stopped + command: + - --no-sandbox + - --disable-gpu + - --remote-debugging-address=0.0.0.0 + - --remote-debugging-port=9222 meilisearch: image: getmeili/meilisearch:v1.6 restart: unless-stopped @@ -35,6 +43,7 @@ services: environment: REDIS_HOST: redis MEILI_ADDR: http://meilisearch:7700 + BROWSER_WEB_URL: http://chrome:9222 DATA_DIR: /data # OPENAI_API_KEY: ... depends_on: diff --git a/docker/start-chrome.sh b/docker/start-chrome.sh deleted file mode 100644 index 9f715906..00000000 --- a/docker/start-chrome.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x; -id -u chrome &>/dev/null || adduser -S chrome; -mkdir -p $BROWSER_USER_DATA_DIR; -chown chrome $BROWSER_USER_DATA_DIR; -runuser -u chrome -- $CHROME_PATH --no-sandbox $@; -- cgit v1.2.3-70-g09d2