do some improvements

witjem · Aug 29, 2022 · 773825e · 773825e
1 parent 9cce35e
commit 773825e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -6,20 +6,15 @@
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-platform="linux/amd64,linux/arm64"
-docker: ## build multi-platforms and push docker image
-	docker buildx build --platform=$(platform) --push --tag=witjem/feedpls:main --progress=plain .
-.PHONY: docker
-
 tests: ## run go tests
 	go test ./...
 .PHONY: tests
 
-tests-e2e: ## run end-to-end  tests
+tests-e2e: ## run end-to-end tests
 	./test/run.sh
 .PHONY: tests-e2e
 
-tests-all: tests tests-e2e ## run end-to-end tests
+tests-all: tests tests-e2e ## run all tests
 .PHONY: tests-all
 
 lint: ## check by golangci-lint linters

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Feedpls is a simple web service to generate RSS/Atom for web page which does not
 [![Image Size](https://img.shields.io/docker/image-size/witjem/feedpls/main)](https://hub.docker.com/r/witjem/feedpls)
 ## Configuration
 
-Example `feeds.yaml`
+Example `feeds.yml`
 
 ```yaml
 ---
@@ -53,17 +53,17 @@ Example `docker-compose.yml`
 ```yml
 services:
   feedpls:
-    image: witjem/feedpls:main
+    image: witjem/feedpls:main # or ghcr.io/witjem/feedpls:main
     container_name: feedpls
     hostname: feedpls
     ports:
       - "8080:8080"
     volumes:
-      - ./feeds.yaml:/feeds.yaml
+      - ./feeds.yml:/feeds.yml
     environment:
       - APP_PORT=8080
       - APP_SECRET=1234 # access-key
-      - APP_FEEDS=/feeds.yaml
+      - APP_FEEDS=/feeds.yml
       - APP_TTL=5m # feed cache time
 ```
 

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   feedpls:
-    image: witjem/feedpls:main
+    image: witjem/feedpls:main # or ghcr.io/witjem/feedpls:main
     container_name: feedpls
     hostname: feedpls
     ports:

diff --git a/internal/feed/feeds_test.go b/internal/feed/feeds_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestCreateFeedsFromYaml(t *testing.T) {
-	cfg, err := feed.ReadFeedsConfigs("./testdata/valid-feeds-config.yaml")
+	cfg, err := feed.ReadFeedsConfigs("./testdata/valid-feeds-config.yml")
 	assert.NoError(t, err)
 	expected := feed.FeedsConfig{
 		feed.SourceConfig{

diff --git a/...nal/feed/testdata/valid-feeds-config.yaml → ...rnal/feed/testdata/valid-feeds-config.yml b/...nal/feed/testdata/valid-feeds-config.yaml → ...rnal/feed/testdata/valid-feeds-config.yml