From 54e3250156fd579fdd0b8a3a030321d329933e13 Mon Sep 17 00:00:00 2001 From: ytqh Date: Sun, 2 Feb 2025 22:32:08 +0800 Subject: [PATCH] build and upload jim-api image --- Makefile | 4 ++-- api/Dockerfile | 4 +++- docker/docker-compose-template.yaml | 4 ++-- docker/docker-compose.yaml | 4 ++-- docker/nginx/conf.d/default.conf.template | 5 +++++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f031b07f1b..cedd5a14dd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Variables DOCKER_REGISTRY=akiyu303 -WEB_IMAGE=$(DOCKER_REGISTRY)/lefeng-web -API_IMAGE=$(DOCKER_REGISTRY)/lefeng-api +WEB_IMAGE=$(DOCKER_REGISTRY)/jim-web +API_IMAGE=$(DOCKER_REGISTRY)/jim-api VERSION=latest PLATFORM=linux/amd64 diff --git a/api/Dockerfile b/api/Dockerfile index fd3532e32d..167f8c69ed 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -55,9 +55,11 @@ RUN apt-get update \ && echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list \ && apt-get update \ # For Security - && apt-get install -y --no-install-recommends expat=2.6.4-1 libldap-2.5-0=2.5.19+dfsg-1 perl=5.40.0-8 libsqlite3-0=3.46.1-1 zlib1g=1:1.3.dfsg+really1.3.1-1+b1 \ + && apt-get install -y --no-install-recommends expat=2.6.4-1 libldap-2.5-0 perl=5.40.0-8 libsqlite3-0=3.46.1-1 zlib1g=1:1.3.dfsg+really1.3.1-1+b1 \ # install a chinese font to support the use of tools like matplotlib && apt-get install -y fonts-noto-cjk \ + # Add libmagic1 installation + && apt-get install -y libmagic1 libmagic-mgc=1:5.44-3 \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml index 6f6508c77b..16927749b0 100644 --- a/docker/docker-compose-template.yaml +++ b/docker/docker-compose-template.yaml @@ -2,7 +2,7 @@ x-shared-env: &shared-api-worker-env services: # API service api: - image: langgenius/dify-api:0.15.2 + image: akiyu303/jim-api:latest restart: always extra_hosts: - "host.docker.internal:host-gateway" @@ -27,7 +27,7 @@ services: # worker service # The Celery worker for processing the queue. worker: - image: langgenius/dify-api:0.15.2 + image: akiyu303/jim-api:latest restart: always extra_hosts: - "host.docker.internal:host-gateway" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 0c4c3b2bfe..7b7722872c 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -396,7 +396,7 @@ x-shared-env: &shared-api-worker-env services: # API service api: - image: langgenius/dify-api:0.15.2 + image: akiyu303/jim-api:latest restart: always extra_hosts: - "host.docker.internal:host-gateway" @@ -421,7 +421,7 @@ services: # worker service # The Celery worker for processing the queue. worker: - image: langgenius/dify-api:0.15.2 + image: akiyu303/jim-api:latest restart: always extra_hosts: - "host.docker.internal:host-gateway" diff --git a/docker/nginx/conf.d/default.conf.template b/docker/nginx/conf.d/default.conf.template index 9691122cea..bcea132ce8 100644 --- a/docker/nginx/conf.d/default.conf.template +++ b/docker/nginx/conf.d/default.conf.template @@ -24,6 +24,11 @@ server { include proxy.conf; } + location /apidocs { + proxy_pass http://api:5001; + include proxy.conf; + } + location / { proxy_pass http://web:3000; include proxy.conf;