From c3fe7e41a2d7cad6218756b7b7f9f45b5c055863 Mon Sep 17 00:00:00 2001 From: franktrue Date: Sun, 30 Apr 2023 20:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- Dockerfile | 6 +++--- README.md | 10 +++++----- deploy/Dockerfile | 13 +++++++++++++ deploy/docker-compose.yml | 14 ++++++++++++++ deploy/work.ini | 11 +++++++++++ 6 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 deploy/Dockerfile create mode 100644 deploy/docker-compose.yml create mode 100644 deploy/work.ini diff --git a/.drone.yml b/.drone.yml index f352301..204c632 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,9 +18,9 @@ steps: hosts: # 多个ip使用,隔开 from_secret: ssh_host # 来源目录 - source: ./api2gpt-mid + source: ./api2gpt-mid,deplpy/ # 目标服务器目录 target: /mnt/data/wwwroot/api2gpt/mid script: - cd /mnt/data/wwwroot/api2gpt/mid - - ./api2gpt-mid \ No newline at end of file + - docker-compose up -d --build \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a4ab424..d2e287b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build step -FROM golang:1.18 AS builder +FROM golang:1.18-alpine AS builder ENV GOPROXY=https://goproxy.cn,direct RUN mkdir -p /build WORKDIR /build @@ -14,5 +14,5 @@ RUN set -x && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install - EXPOSE 8080 WORKDIR /app -COPY --from=builder /build/main /app/api2u-go -ENTRYPOINT ["/app/api2u-go"] \ No newline at end of file +COPY --from=builder /build/main /app/api2gpt-mid +ENTRYPOINT ["/app/api2gpt-mid"] \ No newline at end of file diff --git a/README.md b/README.md index 2409e1f..07e7719 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ ## docker 打包镜像 -docker stop api2u-go -docker rm api2u-go -docker build -t api2u-go . +docker stop aapi2gpt-mid +docker rm aapi2gpt-mid +docker build -t aapi2gpt-mid . ## docker 运行镜像 -docker run -d -p 8081:8080 --name=api2u-go --env REDIS_ADDRESS=172.17.0.1:6379 api2u-go -docker run -p 8081:8080 --name=api2u-go --env REDIS_ADDRESS=172.17.0.1:6379 api2u-go +docker run -d -p 8081:8080 --name=aapi2gpt-mid --env REDIS_ADDRESS=172.17.0.1:6379 aapi2gpt-mid +docker run -p 8081:8080 --name=aapi2gpt-mid --env REDIS_ADDRESS=172.17.0.1:6379 aapi2gpt-mid diff --git a/deploy/Dockerfile b/deploy/Dockerfile new file mode 100644 index 0000000..0aa2446 --- /dev/null +++ b/deploy/Dockerfile @@ -0,0 +1,13 @@ +FROM alpine:latest +WORKDIR /app +# 更新安装源 +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories + +RUN apk update && apk add --no-cache bash supervisor +RUN adduser -S -D -H -h /app -s /sbin/nologin -u 1000 app + +RUN chown -R app /app +ADD server /app/server +ADD work.ini /etc/supervisor.d/ + +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] \ No newline at end of file diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml new file mode 100644 index 0000000..53626e9 --- /dev/null +++ b/deploy/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3" +services: + server: + build: + context: . + dockerfile: Dockerfile + container_name: api2gpt-mid + environment: + # 时区上海 + TZ: Asia/Shanghai + privileged: true + restart: always + ports: + - 8082:8080 \ No newline at end of file diff --git a/deploy/work.ini b/deploy/work.ini new file mode 100644 index 0000000..947f34e --- /dev/null +++ b/deploy/work.ini @@ -0,0 +1,11 @@ +[supervisord] +nodaemon=true +loglevel=debug + +[program:api2gpt-mid] +priority=1 +directory=/app/server/ +command=/app/server/api2gpt-mid +user=app +autostart=true +autorestart=true \ No newline at end of file