Merge pull request #170 from Dogtiti/refactor/docker

fix: refactor docker

Author: Dogtiti

.env.example

@@ -3,15 +3,27 @@ NODE_ENV=development
 
 # Next Auth config:
 # Generate a secret with `openssl rand -base64 32`, or visit https://generate-secret.vercel.app/
-NEXTAUTH_SECRET=changeme
+NEXTAUTH_SECRET=***
 NEXTAUTH_URL=http://localhost:3000
 
 # Prisma
 DATABASE_URL=file:./db.sqlite
 
 # External APIs:
-OPENAI_API_KEY=changeme
+OPENAI_API_KEY=***
 
 # Guest Mode:
-//The key NEXT_PUBLIC_GUEST_KEY should be in this format: abc,qwe,123, where each comma-separated value can be used
-NEXT_PUBLIC_GUEST_KEY=changeme
+The key NEXT_PUBLIC_GUEST_KEY should be in this format: abc,qwe,123, where each comma-separated value can be used
+NEXT_PUBLIC_GUEST_KEY=***
+
+# Websearch. Fill both of these values to enable it locally
+NEXT_PUBLIC_WEB_SEARCH_ENABLED=false  # Disables the ability to toggle web search
+SERP_API_KEY=*** # https://serper.dev/ for an API key
+
+# Auth providers. Required to enable sign in, in production. Development mode uses local auth.
+GOOGLE_CLIENT_ID=***
+GOOGLE_CLIENT_SECRET=***
+GITHUB_CLIENT_ID=***
+GITHUB_CLIENT_SECRET=***
+DISCORD_CLIENT_SECRET=***
+DISCORD_CLIENT_ID=***

.github/workflows/build-docker-image.yml

@@ -36,10 +36,20 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          file: prod.Dockerfile
           build-args: |
             NEXTAUTH_URL=http://localhost:3000
-            DATABASE_URL=file:../db/db.sqlite
-            SKIP_ENV_VALIDATION=1
+            DATABASE_URL=file:./db.sqlite
+            OPENAI_API_KEY: ${OPENAI_API_KEY}
+            NEXT_PUBLIC_WEB_SEARCH_ENABLED: ${NEXT_PUBLIC_WEB_SEARCH_ENABLED}
+            SERP_API_KEY: ${SERP_API_KEY}
+            NEXT_PUBLIC_FF_AUTH_ENABLED: ${NEXT_PUBLIC_FF_AUTH_ENABLED}
+            GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
+            GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
+            GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID}
+            GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET}
+            DISCORD_CLIENT_ID: ${DISCORD_CLIENT_ID}
+            DISCORD_CLIENT_SECRET: ${DISCORD_CLIENT_SECRET}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -39,11 +39,13 @@ One-Click to deploy well-designed AutoGPT-Next-Web web UI on Vercel.
 - [ ] 5. Add support for WeChat login
 
 ## Business Version
-During the period of maintaining open source projects, many friends came to consult about customizing the system. Considering that there may be more friends who have similar needs, we decided to start the internal test plan of the commercial version~ 
-* plan support -
-User login system, billing system, charging system, etc., so that everyone can directly deploy a charged version of AutoGPT, and can directly obtain income 
-* way of participation -
-To pre-order the commercial version and view the details of the commercial version plan, please click the link below [AutoGPT-Next-Web Business Vision](https://egqz2y6eul.feishu.cn/docx/PxoMd7LGfoobAixiuWacxRWQnNd)
+
+During the period of maintaining open source projects, many friends came to consult about customizing the system. Considering that there may be more friends who have similar needs, we decided to start the internal test plan of the commercial version~
+
+- plan support -
+  User login system, billing system, charging system, etc., so that everyone can directly deploy a charged version of AutoGPT, and can directly obtain income
+- way of participation -
+  To pre-order the commercial version and view the details of the commercial version plan, please click the link below [AutoGPT-Next-Web Business Vision](https://egqz2y6eul.feishu.cn/docx/PxoMd7LGfoobAixiuWacxRWQnNd)
 
 ## Get Started
 
@@ -66,15 +68,15 @@ A: The project originated from AgentGPT. Our goal is to continuously provide use
 The easiest way to run AutoGPT-Next-Web locally is by using docker.
 
 ```bash
- docker-compose -f docker-compose-local.yml up -d --remove-orphans
+ docker-compose -f docker-compose.dev.yml up -d --remove-orphans
 ```
 
 ### Docker-Image
 
 Using `docker-image`
 
 ```bash
-docker-compose up -d --remove-orphans
+docker-compose  -f docker-compose.prod.yml up -d --remove-orphans
 ```
 
 ### Local Development Setup

README.md

@@ -0,0 +1,61 @@
+FROM node:19-alpine
+
+RUN apk update && apk add --no-cache openssl
+
+ARG NEXTAUTH_SECRET=$(openssl rand -base64 32)
+ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET
+
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+
+ARG NEXTAUTH_SECRET=
+ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET
+
+ARG NEXTAUTH_URL
+ENV NEXTAUTH_URL=$NEXTAUTH_URL
+
+ARG SKIP_ENV_VALIDATION
+ENV SKIP_ENV_VALIDATION=$SKIP_ENV_VALIDATION
+
+WORKDIR /app
+
+
+
+# Install dependencies based on the preferred package manager
+COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
+
+# Copy the rest of the application code
+COPY . .
+
+# Prevent Husky errors by disabling the `prepare` script
+RUN npm pkg set scripts.prepare="exit 0"
+
+# set npm registry
+RUN npm config set registry 'https://registry.npmmirror.com/'
+
+RUN \
+  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+  elif [ -f package-lock.json ]; then npm ci; \
+  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i; \
+  # Allow install without lockfile, so example works even without Node.js installed locally
+  else echo "Warning: Lockfile not found. It is recommended to commit lockfiles to version control." && yarn install; \
+  fi
+
+
+
+
+ENTRYPOINT ["sh", "entrypoint.sh"]
+
+# Next.js collects completely anonymous telemetry data about general usage. Learn more here: https://nextjs.org/telemetry
+# Uncomment the following line to disable telemetry at run time
+# ENV NEXT_TELEMETRY_DISABLED 1
+
+# Note: Don't expose ports here, Compose will handle that for us
+
+# Start Next.js in development mode based on the preferred package manager
+CMD \
+  if [ -f yarn.lock ]; then yarn dev; \
+  elif [ -f package-lock.json ]; then npm run dev; \
+  elif [ -f pnpm-lock.yaml ]; then pnpm dev; \
+  else yarn dev; \
+  fi

dev.Dockerfile

@@ -0,0 +1,29 @@
+version: '3'
+
+volumes:
+  db:
+  src:
+  public:
+
+services:
+  autogpt:
+    build:
+      context: .
+      dockerfile: dev.Dockerfile
+      args:
+        NEXTAUTH_URL: http://localhost:3000
+        DATABASE_URL: file:./db.sqlite
+        SKIP_ENV_VALIDATION: 1 # omit this property to enable schema validation for the environment variables
+    container_name: autogpt
+    environment:
+     OPENAI_API_KEY: ${OPENAI_API_KEY} # openai api key
+     NEXT_PUBLIC_WEB_SEARCH_ENABLED: ${NEXT_PUBLIC_WEB_SEARCH_ENABLED} # enable web search
+     SERP_API_KEY: ${SERP_API_KEY} # serp api key
+     NEXT_PUBLIC_GUEST_KEY: ${NEXT_PUBLIC_GUEST_KEY} #  guest key
+    ports:
+      - 3000:3000
+    volumes:
+      - src:/app/src
+      - public:/app/public
+      - db:/app/db
+    restart: unless-stopped

docker-compose-local.yml

@@ -0,0 +1,26 @@
+version: '3'
+
+services:
+  autogpt:
+    container_name: autogpt
+    image: dogtititi/autogpt-next-web:lastest
+    # build:
+    #   context: .
+    #   dockerfile: prod.Dockerfile
+    #   args:
+    #     NEXTAUTH_URL: http://localhost:3000
+    #     DATABASE_URL: file:./db.sqlite
+    #     OPENAI_API_KEY: ${OPENAI_API_KEY} # openai api key
+    #     NEXT_PUBLIC_WEB_SEARCH_ENABLED: ${NEXT_PUBLIC_WEB_SEARCH_ENABLED} # enable web search
+    #     SERP_API_KEY: ${SERP_API_KEY} # serp api key
+    #     NEXT_PUBLIC_GUEST_KEY: ${NEXT_PUBLIC_GUEST_KEY} #  guest key
+    #     NEXT_PUBLIC_FF_AUTH_ENABLED: ${NEXT_PUBLIC_FF_AUTH_ENABLED}  # auth enable
+    #     GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} # google client id
+    #     GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} # google client secret
+    #     GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID} # github client id
+    #     GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET} # github client secret
+    #     DISCORD_CLIENT_ID: ${DISCORD_CLIENT_ID} # discord client id
+    #     DISCORD_CLIENT_SECRET: ${DISCORD_CLIENT_SECRET} # discord client secret
+    ports:
+      - 3000:3000
+    restart: unless-stopped

docker-compose.dev.yml

@@ -39,11 +39,13 @@ One-Click to deploy well-designed AutoGPT-Next-Web web UI on Vercel.
 - [ ] 5. 增加微信登录支持
 
 ## 商业愿景
+
 在维护开源项目的期间，很多朋友前来咨询关于定制系统的事宜。考虑到可能有更多有类似需求的朋友，我们决定启动商业版本的内部测试计划
-* 计划支持 -
-用户登录系统、计费系统、收费系统等，使每个人都可以直接部署一个收费版本的AutoGPT，并直接获得收入。
-* 参与方式 -
-要预定商业版并查看商业版计划的详情，请单击下面的链接[AutoGPT-Next-Web商业愿景](https://egqz2y6eul.feishu.cn/docx/PxoMd7LGfoobAixiuWacxRWQnNd)。
+
+- 计划支持 -
+  用户登录系统、计费系统、收费系统等，使每个人都可以直接部署一个收费版本的 AutoGPT，并直接获得收入。
+- 参与方式 -
+  要预定商业版并查看商业版计划的详情，请单击下面的链接[AutoGPT-Next-Web 商业愿景](https://egqz2y6eul.feishu.cn/docx/PxoMd7LGfoobAixiuWacxRWQnNd)。
 
 ## 常见问题
 
@@ -66,15 +68,15 @@ A：项目源自于 AgentGPT，我们目标是持续输出对国内用户友好
 使用 Docker 是在本地运行 AutoGPT-Next-Web 最简单的方法。
 
 ```bash
-docker-compose -f docker-compose-local.yml up -d --remove-orphans
+docker-compose -f docker-compose.dev.yml up -d --remove-orphans
 ```
 
 ### Docker-Image
 
 使用 `docker-image` 部署
 
 ```bash
-docker-compose up -d --remove-orphans
+docker-compose -f docker-compose.prod.yml up -d --remove-orphans
 ```
 
 ### 本地开发环境配置