Ver código fonte

优化docker配置

locky 1 mês atrás
pai
commit
c0f1b7269b

+ 2 - 3
.dockerignore

@@ -1,6 +1,5 @@
 __pycache__/
 .gitee/
 .idea/
-static/log/**/*
-!static/log/
-!static/log/*/
+static/log/*/*
+static/apns_pem/*

+ 52 - 0
Docker/compose/docker-compose-test.yml

@@ -0,0 +1,52 @@
+version: "3.8"
+
+services:
+  push-test:
+    image: swr.cn-east-3.myhuaweicloud.com/asj-server/push-test:${TAG}
+    container_name: push-test
+    volumes:
+      - /web/docker/ASJPush/static/:/web/ASJPush/static/
+    environment:
+      SUPERVISOR_CONF: supervisord_test.conf
+      OMP_NUM_THREADS: "1"
+      OPENBLAS_NUM_THREADS: "1"
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 65535
+        hard: 65535
+    networks:
+      - backend
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/init/health-check"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 20s
+
+  nginx:
+    image: swr.cn-east-3.myhuaweicloud.com/library/nginx:latest
+    container_name: nginx
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - /web/docker/certs/test.push.zositechc.cn.pem:/etc/nginx/certs/test.push.zositechc.cn.pem:ro
+      - /web/docker/certs/test.push.zositechc.cn.key:/etc/nginx/certs/test.push.zositechc.cn.key:ro
+    depends_on:
+      - push-test
+    networks:
+      - backend
+    healthcheck:
+      test: ["CMD-SHELL", "nginx -t || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 20s
+
+networks:
+  backend:
+    driver: bridge

+ 4 - 0
Docker/conf/supervisord_test.conf

@@ -40,3 +40,7 @@ autostart=true
 autorestart=true
 stopasgroup=true
 killasgroup=true
+stdout_logfile=/var/log/supervisor/gunicorn.log
+stderr_logfile=/var/log/supervisor/gunicorn_error.log
+stdout_logfile_maxbytes=50MB
+stderr_logfile_maxbytes=50MB

+ 1 - 0
Dockerfile

@@ -7,6 +7,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     apt-utils \
     gcc \
+    curl \
     libffi-dev \
     libssl-dev \
     supervisor \

+ 1 - 1
docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
   push-test:
     build: .
-    container_name: push
+    container_name: push-test
     ports:
       - "8000:8000"
     environment: