Skip to content

Commit

Permalink
feat: 修改默认配置以适应单compose文件启动
Browse files Browse the repository at this point in the history
  • Loading branch information
RockChinQ committed Aug 30, 2024
1 parent 0a938c2 commit bcaf289
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
COPY bin/campux /app/campux
COPY frontend/dist /app/frontend/dist

EXPOSE 8080
EXPOSE 8081

ENV GIN_MODE=release

Expand Down
4 changes: 2 additions & 2 deletions backend/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Config struct {
// 仅在配置文件不存在时调用
func SetInitValue() {
viper.SetDefault("backend.host", "0.0.0.0")
viper.SetDefault("backend.port", "8080")
viper.SetDefault("backend.port", "8081")

// jwt
viper.SetDefault("auth.jwt.secret", uuid.New().String())
Expand Down Expand Up @@ -50,7 +50,7 @@ func SetInitValue() {
viper.SetDefault("oss.minio.use_ssl", false)

// redis
viper.SetDefault("mq.redis.addr", "localhost:6379")
viper.SetDefault("mq.redis.addr", "campux-redis:6379")
viper.SetDefault("mq.redis.password", "campux123456")
viper.SetDefault("mq.redis.db", 0)

Expand Down
53 changes: 53 additions & 0 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
version: "3"
services:
redis:
image: redis:6-alpine
restart: always
container_name: campux-redis
volumes:
# Mount the redis data directory to the container.
- ./volumes/redis/data:/data
# Set the redis password when startup redis server.
command: redis-server --requirepass campux123456
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
networks:
- campux-network

campux:
image: rockchin/campux:latest
container_name: campux
ports:
- 8081:8081
volumes:
- ./volumes/campux/data:/app/data
networks:
- campux-network
environment:
- GIN_MODE=release

campuxbot:
image: rockchin/campuxbot:latest
container_name: campux-bot
restart: always
ports:
- 8282:8282
volumes:
- ./volumes/campuxbot/data:/app/data
environment:
- TZ=Asia/Shanghai
networks:
- campux-network

campuxutility:
image: rockchin/campuxutility:latest
container_name: campux-utility
restart: always
volumes:
- ./volumes/campuxutility/data:/app/data
networks:
- campux-network

networks:
campux-network:
external: true
13 changes: 0 additions & 13 deletions docker/minio/docker-compose.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions docker/mongodb/docker-compose.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ func main() {
}

// 配置文件
_, created, err := config.NewConfig()
_, _, err = config.NewConfig()

if err != nil {
panic(err)
}

if created {
panic("请修改配置文件后重启")
}
// if created {
// panic("请修改配置文件后重启")
// }

err = migrate.DoMigration()

Expand Down

0 comments on commit bcaf289

Please sign in to comment.