Переписал Dockerfile, теперь образы контейнеров весят меньше

Reviewed-on: #6

.gitignore

@@ -19,6 +19,7 @@ config.yaml
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 kiki
+redis_data
 # Dependency directories (remove the comment below to include it)
 # vendor/
 

Dockerfile

@@ -1,4 +1,6 @@
-FROM golang:1.24
+FROM golang:1.24-alpine AS build
+
+RUN apk add --no-cache make
 
 WORKDIR /app/kiki
 
@@ -14,4 +16,12 @@ COPY Makefile /app/kiki/
 
 RUN make
 
+FROM alpine:latest
+
+WORKDIR /app/kiki/
+
+COPY --from=build /app/kiki/kiki /app/kiki/kiki
+
+RUN chmod +x /app/kiki/kiki
+
 CMD [ "/app/kiki/kiki", "run" ]

README.md

@@ -23,8 +23,10 @@ instance: https://pleroma.catgirls.asia #Адрес инстанса
 rss_urls: #YAML массив лент
   - url: https://habr.com/ru/rss/flows/admin/articles/?fl=ru #Адрес ленты
     sensitive: false #Нужно ли ставить NSFW плашку
+    visibility: "unlisted" #Режим отображения постов. Есть public, unlisted, private, direct
   - url: https://4pda.to/feed
     sensitive: false
+    visibility: "unlisted"
 redis:
   address: localhost:6379 #Адрес Redis, в случае использования Docker Compose необходимо написать redis:6379
 ```

config.example.yaml

@@ -2,7 +2,9 @@ instance: https://pleroma.catgirls.asia
 rss_urls:
   - url: https://habr.com/ru/rss/flows/admin/articles/?fl=ru
     sensitive: false
+    visibility: "unlisted"
   - url: https://4pda.to/feed
     sensitive: false
+    visibility: "unlisted"
 redis:
   address: localhost:6379

config/config.go

@@ -12,8 +12,9 @@ import (
 type KikiSettings struct {
 	Instance string `yaml:"instance,omitempty"`
 	RSSURLs  []struct {
-		Url       string `yaml:"url,omitempty"`
+		Url        string `yaml:"url,omitempty"`
-		Sensitive bool   `yaml:"sensitive,omitempty"`
+		Sensitive  bool   `yaml:"sensitive,omitempty"`
+		Visibility string `yaml:"visibility"`
 	} `yaml:"rss_urls,omitempty"`
 	Redis struct {
 		Address string `yaml:"address"`

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   kiki:
-    build: ./
+    image: git.catgirls.asia/b4d_us3r/kiki:latest
     restart: always
     volumes:
       - ./config.yaml:/app/kiki/config.yaml

service/kiki.go

@@ -90,7 +90,7 @@ func main() {
 								if !inStack {
 									log.Println(post.Description)
 
-									toot, err := tooter.CreateToot(*mastoClient, post, rssUrl.Sensitive)
+									toot, err := tooter.CreateToot(*mastoClient, post, rssUrl.Sensitive, rssUrl.Visibility)
 									if err != nil {
 										log.Println(err)
 									}

tooter/tooter.go

@@ -154,14 +154,14 @@ func UploadPictures(mastoClient mastodon.Client, filesBytes [][]byte) []*mastodo
 }
 
 // Формирование тела статуса
-func CreateToot(mastoClient mastodon.Client, newsDesc *gofeed.Item, sensitive bool) (mastodon.Toot, error) {
+func CreateToot(mastoClient mastodon.Client, newsDesc *gofeed.Item, sensitive bool, visibility string) (mastodon.Toot, error) {
 	var imgArray []string
 	var attachments []*mastodon.Attachment
 
 	var tootText string = fmt.Sprintf("src: %s\n\n", newsDesc.Link)
 
 	toot := mastodon.Toot{
-		Visibility: "unlisted",
+		Visibility: visibility,
 		Sensitive:  sensitive,
 	}