diff --git a/client/discord/discord.go b/client/discord/discord.go index 5e2d06f..b540b34 100644 --- a/client/discord/discord.go +++ b/client/discord/discord.go @@ -89,7 +89,6 @@ func Run(conf domain.Config, opts DiscordOptions) error { // UPDATE FORUM IF NEEDED: - // forum, err := session.Channel(os.Getenv("TASKS_CHANNEL")) forum, err := s.Channel(conf.Discord.IsProjectChannel) if err != nil { log.Print(err) @@ -106,7 +105,7 @@ func Run(conf domain.Config, opts DiscordOptions) error { var cmds []*discordgo.ApplicationCommand var logString []string for _, h := range router.Commands { - cmd, err := s.ApplicationCommandCreate(s.State.User.ID, "1103928338898235462", &h.Command) + cmd, err := s.ApplicationCommandCreate(s.State.User.ID, "", &h.Command) if err != nil { log.Panicf("Cannot create '%v' command: %v", h.Command.Name, err) } diff --git a/cmd/main.go b/cmd/main.go index 662848c..bea4632 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -21,8 +21,11 @@ import ( ) const ( - envfile = "../develop.env" + envfile = ".env" migrationfile = "../internal/storage/migrate" + // production env: + // envfile = "../docker/prod.env" + // migrationfile = "../internal/storage/migrate" ) func main() { diff --git a/compose.yaml b/compose.dev.yaml similarity index 57% rename from compose.yaml rename to compose.dev.yaml index 4669b2c..875bedb 100644 --- a/compose.yaml +++ b/compose.dev.yaml @@ -1,12 +1,12 @@ services: - ticket-pimp: - container_name: pimp - image: naudachu/ticket-pimp - ports: - - "8080:8080" - depends_on: - postgres: - condition: service_healthy + # ticket-pimp: + # container_name: pimp + # image: naudachu/ticket-pimp + # ports: + # - "8080:8080" + # depends_on: + # postgres: + # condition: service_healthy postgres: container_name: db image: "postgres:16.1-alpine3.18" @@ -14,14 +14,10 @@ services: POSTGRES_DB: "tickets" POSTGRES_USER: "postgres" POSTGRES_PASSWORD: "postgres" - volumes: - - db-data:/var/lib/postgresql/data ports: - "5432:5432" healthcheck: test: [ "CMD", "pg_isready", "-q", "-d", "tickets", "-U", "postgres" ] interval: 10s timeout: 5s - retries: 5 -volume: - db-data: \ No newline at end of file + retries: 5 \ No newline at end of file diff --git a/readme.md b/readme.md index ab0af62..5c1ed62 100644 --- a/readme.md +++ b/readme.md @@ -8,13 +8,20 @@ 1. Вытягиваем новый образ: `scp ./compose.yaml root@serverhost:~/compose.yaml` 2. Запуск контейнера: `docker-compose up -d` -# Migrations / sqlc: +# Разработка: + +## Запуск вспомогательного контейнера с базой: +`docker-compose -f compose.dev.yaml up -d` + +## Migrations / sqlc: +*Deprecated*, т.к. проверяем и делаем миграции в коде. + ``` cd ${PROJECT_FOLDER}/internal/storage sql-migrate up ``` -# Repository code-gen +## Repository code-gen Запулить докер sqlc: `docker pull sqlc/sqlc` Запустить команду из корня проекта: `cd ./internal/storage && docker run --rm -v "$(pwd):/src" -w /src sqlc/sqlc generate` \ No newline at end of file