small prod -> dev fixes

This commit is contained in:
naudachu 2023-11-20 19:56:12 +05:00
parent 4a1a088fac
commit 290d0d1f48
4 changed files with 23 additions and 18 deletions

View File

@ -89,7 +89,6 @@ func Run(conf domain.Config, opts DiscordOptions) error {
// UPDATE FORUM IF NEEDED: // UPDATE FORUM IF NEEDED:
// forum, err := session.Channel(os.Getenv("TASKS_CHANNEL"))
forum, err := s.Channel(conf.Discord.IsProjectChannel) forum, err := s.Channel(conf.Discord.IsProjectChannel)
if err != nil { if err != nil {
log.Print(err) log.Print(err)
@ -106,7 +105,7 @@ func Run(conf domain.Config, opts DiscordOptions) error {
var cmds []*discordgo.ApplicationCommand var cmds []*discordgo.ApplicationCommand
var logString []string var logString []string
for _, h := range router.Commands { 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 { if err != nil {
log.Panicf("Cannot create '%v' command: %v", h.Command.Name, err) log.Panicf("Cannot create '%v' command: %v", h.Command.Name, err)
} }

View File

@ -21,8 +21,11 @@ import (
) )
const ( const (
envfile = "../develop.env" envfile = ".env"
migrationfile = "../internal/storage/migrate" migrationfile = "../internal/storage/migrate"
// production env:
// envfile = "../docker/prod.env"
// migrationfile = "../internal/storage/migrate"
) )
func main() { func main() {

View File

@ -1,12 +1,12 @@
services: services:
ticket-pimp: # ticket-pimp:
container_name: pimp # container_name: pimp
image: naudachu/ticket-pimp # image: naudachu/ticket-pimp
ports: # ports:
- "8080:8080" # - "8080:8080"
depends_on: # depends_on:
postgres: # postgres:
condition: service_healthy # condition: service_healthy
postgres: postgres:
container_name: db container_name: db
image: "postgres:16.1-alpine3.18" image: "postgres:16.1-alpine3.18"
@ -14,8 +14,6 @@ services:
POSTGRES_DB: "tickets" POSTGRES_DB: "tickets"
POSTGRES_USER: "postgres" POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: "postgres" POSTGRES_PASSWORD: "postgres"
volumes:
- db-data:/var/lib/postgresql/data
ports: ports:
- "5432:5432" - "5432:5432"
healthcheck: healthcheck:
@ -23,5 +21,3 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
volume:
db-data:

View File

@ -8,13 +8,20 @@
1. Вытягиваем новый образ: `scp ./compose.yaml root@serverhost:~/compose.yaml` 1. Вытягиваем новый образ: `scp ./compose.yaml root@serverhost:~/compose.yaml`
2. Запуск контейнера: `docker-compose up -d` 2. Запуск контейнера: `docker-compose up -d`
# Migrations / sqlc: # Разработка:
## Запуск вспомогательного контейнера с базой:
`docker-compose -f compose.dev.yaml up -d`
## Migrations / sqlc:
*Deprecated*, т.к. проверяем и делаем миграции в коде.
``` ```
cd ${PROJECT_FOLDER}/internal/storage cd ${PROJECT_FOLDER}/internal/storage
sql-migrate up sql-migrate up
``` ```
# Repository code-gen ## Repository code-gen
Запулить докер sqlc: `docker pull sqlc/sqlc` Запулить докер sqlc: `docker pull sqlc/sqlc`
Запустить команду из корня проекта: `cd ./internal/storage && docker run --rm -v "$(pwd):/src" -w /src sqlc/sqlc generate` Запустить команду из корня проекта: `cd ./internal/storage && docker run --rm -v "$(pwd):/src" -w /src sqlc/sqlc generate`