diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 06e7b13..132c734 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -18,44 +18,28 @@ services: - /opt/hsz/redis/data:/data command: redis-server /usr/local/etc/redis/conf/redis.conf - es: - container_name: es - image: docker.1ms.run/elasticsearch:8.12.2 - environment: - - 'ELASTIC_PASSWORD=1234567a' - - discovery.type=single-node - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - xpack.security.http.ssl.enabled=false - - xpack.security.enabled=false - - ES_SETTING_XPACK_SECURITY_ENABLED=false - ports: - - "9200:9200" - - "9300:9300" - networks: - - tsg-bridge - - #前端 - hsz-nginx: - container_name: hsz-nginx - image: docker.1ms.run/library/nginx:mainline-alpine-perl - privileged: true - ports: - - "8088:80" - - "4443:443" - networks: - - tsg-bridge - volumes: - - /opt/hsz/nginx/html:/usr/share/nginx/html - #- /opt/tsg/nginx/conf/default.conf:/etc/nginx/nginx.conf - - /opt/hsz/nginx/conf/nginx.conf:/etc/nginx/nginx.conf - #- /home/ec2-user/etx/nginx/ssl/ssl.crt:/etc/nginx/ssl.crt - #- /home/ec2-user/etx/nginx/ssl/ssl.key:/etc/nginx/ssl.key - - /opt/hsz/java:/app - depends_on: - - hsz-dev - #- language-server - environment: - - NGINX_ENABLE_HTTPS=no # 关键:禁用默认HTTPS配置 +# #前端 +# hsz-nginx: +# container_name: hsz-nginx +# image: docker.1ms.run/library/nginx:mainline-alpine-perl +# privileged: true +# ports: +# - "8088:80" +# - "4443:443" +# networks: +# - tsg-bridge +# volumes: +# - /opt/hsz/nginx/html:/usr/share/nginx/html +# #- /opt/tsg/nginx/conf/default.conf:/etc/nginx/nginx.conf +# - /opt/hsz/nginx/conf/nginx.conf:/etc/nginx/nginx.conf +# #- /home/ec2-user/etx/nginx/ssl/ssl.crt:/etc/nginx/ssl.crt +# #- /home/ec2-user/etx/nginx/ssl/ssl.key:/etc/nginx/ssl.key +# - /opt/hsz/java:/app +# depends_on: +# - hsz-dev +# #- language-server +# environment: +# - NGINX_ENABLE_HTTPS=no # 关键:禁用默认HTTPS配置 #后端 hsz-dev: @@ -67,14 +51,13 @@ services: volumes: - /opt/hsz/java:/app ports: - - "24105:24105" + - "24205:24205" environment: # 指定时区 - - SPRING_PROFILES_ACTIVE=prod + - SPRING_PROFILES_ACTIVE=dev - TZ=Asia/Shanghai depends_on: - redis - - es - postgres #启动容器后执行的命令 entrypoint: java -cp "gunshi-project-hsz-1.0-SNAPSHOT.jar:./lib/*" com.gunshi.project.hsz.Main @@ -83,15 +66,17 @@ services: postgres: container_name: postgres image: docker.1ms.run/bitnami/postgresql:latest - privileged: true # 新增:赋予容器特权 environment: - POSTGRES_DB: hsz # 默认数据库名称 - POSTGRES_USER: gunshiiot # 默认用户名 - POSTGRES_PASSWORD: 1234567a # 默认密码 + POSTGRESQL_DATABASE: hsz # 默认数据库名称 + POSTGRESQL_USERNAME: gunshiiot # 默认用户名 + POSTGRESQL_PASSWORD: 1234567a # 默认密码 + TZ: Asia/Shanghai ports: - "5432:5432" # 将容器的 5432 端口映射到主机的 5432 端口 networks: - tsg-bridge volumes: - - /opt/hsz/postgres/data:/var/lib/postgresql/data # 持久化数据卷 - restart: always # 容器意外停止时自动重启 \ No newline at end of file + - /opt/hsz/postgres/data:/bitnami/postgresql + restart: always # 容器意外停止时自动重启] + user: root + privileged: true \ No newline at end of file