diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index be92e51f..c8f4646e 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -40,25 +40,8 @@ services: timeout: 5s retries: 10 - minio: - image: docker.io/bitnami/minio:2024 - restart: always - environment: - # *must* be >= 8 chars or minio will not start - - MINIO_ROOT_USER=gbansgbans - - MINIO_ROOT_PASSWORD=gbansgbans - ports: - - '0.0.0.0:9000:9000' - - '0.0.0.0:9001:9001' - volumes: - - 'minio_data:/bitnami/minio/data' - networks: - - prod_network - volumes: dl_cache: - minio_data: - driver: local networks: prod_network: diff --git a/docker/docker-compose-prod.yml b/docker/docker-compose-prod.yml index 49e38580..57883803 100644 --- a/docker/docker-compose-prod.yml +++ b/docker/docker-compose-prod.yml @@ -42,26 +42,9 @@ services: timeout: 5s retries: 10 - minio: - # Files are currently designed to be served from - image: docker.io/bitnami/minio:2023 - restart: always - environment: - # *must* be >= 8 chars or minio will not start - - MINIO_ROOT_USER=gbansgbans - - MINIO_ROOT_PASSWORD=gbansgbans - ports: - - '127.0.0.1:9000:9000' - - '127.0.0.1:9001:9001' - volumes: - - 'minio_data:/bitnami/minio/data' - networks: - - prod_network - volumes: dl_cache: gbans_db: - minio_data: networks: prod_network: diff --git a/docs/docs/install/INSTALL.md b/docs/docs/install/INSTALL.md index 4de71b76..b0b77837 100644 --- a/docs/docs/install/INSTALL.md +++ b/docs/docs/install/INSTALL.md @@ -30,8 +30,6 @@ Precompiled binaries will be provided once the project is in a more stable state images as they are currently the only tested usecase. - [make](https://www.gnu.org/software/make/) Not strictly required but provides predefined build commands -- [minio](https://min.io/) You will need to have set up minio access/secret keys. Other s3 compatible options should - work but are untested - [golang 1.22+](https://golang.org/) Version >=1.22 is required. - [PostgreSQL](https://www.postgresql.org/) Version 15 is the only version currently tested against. However, anything 10 and up should work, ymmv. diff --git a/internal/cmd/serve.go b/internal/cmd/serve.go index 6d0fec65..03e2f0f6 100644 --- a/internal/cmd/serve.go +++ b/internal/cmd/serve.go @@ -134,17 +134,6 @@ func serveCmd() *cobra.Command { //nolint:maintidx defer discordUsecase.Shutdown(conf.Discord.GuildID) - // // Initialize minio client object. - // minioClient, errMinio := minio.New(conf.S3Store.Endpoint, &minio.Options{ - // Creds: credentials.NewStaticV4(conf.S3Store.AccessKey, conf.S3Store.SecretKey, ""), - // Secure: conf.S3Store.SSL, - // }) - // if errMinio != nil { - // slog.Error("Cannot initialize minio", log.ErrAttr(errDR)) - // - // return - // } - personUsecase := person.NewPersonUsecase(person.NewPersonRepository(conf, dbUsecase), configUsecase) networkUsecase := network.NewNetworkUsecase(eventBroadcaster, network.NewNetworkRepository(dbUsecase), personUsecase, configUsecase)