chore: 更新docker-compose文件配置

damingerdai · Jul 1, 2024 · 45de20d · 45de20d
1 parent 23a9d01
commit 45de20d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,14 +8,16 @@ services:
     ports:
       - 8443:8443
     volumes:
-      - ./application-docker.yml:/app/config/application-docker.yml
+      - ./application-docker.yml:/app/config/application.yml
     networks:
       - hoteler-network
     env_file: .env
-#    links:
-#      - db
+    #    links:
+    #      - db
     depends_on:
       - db
+      - pgbouncer
+      - redis
 
   db:
     image: postgres:16.3-alpine3.19
@@ -32,7 +34,7 @@ services:
       - hoteler-network
   pgbouncer:
     image: edoburu/pgbouncer:1.22.1-p0
-    container_name: 'pgbouncer'
+    container_name: "pgbouncer"
     environment:
       - DATABASE_URL=postgres://postgres:123456@db:5432/postgres
       - POOL_MODE=transaction
@@ -49,7 +51,7 @@ services:
 
   redis:
     image: redis:7.2.5-alpine3.20
-    container_name: 'redis'
+    container_name: "redis"
     ports:
       - 6379:6379
     networks:

diff --git a/src/main/angular b/src/main/angular
+1 −0		.env
+1 −4		.gitignore
+758 −1,278		.yarn/releases/yarn-1.22.19.cjs
+1 −1		.yarnrc
+1 −1		angular.json
+17 −18		package.json
+0 −12		src/proxy.conf.js
+8 −0		src/proxy.conf.json
+8 −0		src/proxy.conf.online.json
+115 −144		yarn.lock