Merge pull request #20 from cytopia/cleanup

Cleanup

Author: cytopia

.github/workflows/params.yml

@@ -54,7 +54,7 @@ jobs:
         with:
           repository_default_branch: master
           branches: master
-          num_latest_tags: 1
+          num_latest_tags: 0
         if: github.event_name == 'schedule'
 
       - name: "[DEBUG] Show settings'"

.gitignore

@@ -0,0 +1,2 @@
+Makefile.docker
+Makefile.lint

Makefile

@@ -44,13 +44,18 @@ ifeq ($(strip $(TAG)),latest)
 	endif
 # Building from any other branch or tag: Tag == '<REF>'
 else
-	DOCKER_TAG = $(FLAVOUR)-$(VERSION)-$(TAG)
+	ifeq ($(strip $(FLAVOUR)),latest)
+		DOCKER_TAG = $(VERSION)-$(TAG)
+	else
+		DOCKER_TAG = $(FLAVOUR)-$(VERSION)-$(TAG)
+	endif
 endif
 ARCH       = linux/amd64
 
 # Makefile.lint overwrites
 FL_IGNORES  = .git/,.github/,tests/,Dockerfiles/data/
 SC_IGNORES  = .git/,.github/,tests/
+JL_IGNORES  = .git/,.github/,./tests/fail*.json
 
 
 # -------------------------------------------------------------------------------------------------

Makefile.docker

@@ -1,9 +1,6 @@
 # Docker image for `jsonlint`
 
 [![Tag](https://img.shields.io/github/tag/cytopia/docker-jsonlint.svg)](https://github.com/cytopia/docker-jsonlint/releases)
-[![](https://images.microbadger.com/badges/version/cytopia/jsonlint:latest.svg?&kill_cache=1)](https://microbadger.com/images/cytopia/jsonlint:latest "jsonlint")
-[![](https://images.microbadger.com/badges/image/cytopia/jsonlint:latest.svg?&kill_cache=1)](https://microbadger.com/images/cytopia/jsonlint:latest "jsonlint")
-[![](https://img.shields.io/docker/pulls/cytopia/jsonlint.svg)](https://hub.docker.com/r/cytopia/jsonlint)
 [![](https://img.shields.io/badge/github-cytopia%2Fdocker--jsonlint-red.svg)](https://github.com/cytopia/docker-jsonlint "github.com/cytopia/docker-jsonlint")
 [![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
 
@@ -44,7 +41,6 @@
 
 View **[Dockerfiles](https://github.com/cytopia/docker-jsonlint/blob/master/Dockerfiles/)** on GitHub.
 
-**[![Docker hub](http://dockeri.co/image/cytopia/jsonlint?&kill_cache=1)](https://hub.docker.com/r/cytopia/jsonlint)**
 
 **Available Architectures:**  `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6`
 
@@ -58,6 +54,9 @@ The image is built nightly against multiple stable versions and pushed to Docker
 
 ## :whale: Available Docker image versions
 
+[![](https://img.shields.io/docker/pulls/cytopia/jsonlint.svg)](https://hub.docker.com/r/cytopia/jsonlint)
+[![Docker](https://badgen.net/badge/icon/:latest?icon=docker&label=cytopia/jsonlint)](https://hub.docker.com/r/cytopia/jsonlint)
+
 #### Rolling releaess
 
 The following Docker image tags are rolling releases and are built and updated every night.
@@ -82,11 +81,11 @@ The following Docker image tags are built once and can be used for reproducible
 
 | Docker Tag          | Git Ref  | Jsonlint    | Flavour | Available Architectures                      |
 |---------------------|----------|-------------|---------|----------------------------------------------|
-| `latest-latest-0.6` | tag: 0.6 | latest      | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
+| `latest-0.6`        | tag: 0.6 | latest      | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
 | `alpine-latest-0.6` | tag: 0.6 | latest      | Alpine  | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
 |                     |          |             |         |                                              |
-| `latest-1.6.0-0.6`  | tag: 0.6 | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
-| `alpine-1.6.0-0.6`  | tag: 0.6 | **`1.6.0`** | Alpine  | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
+| `1.6.0-0.9`         | tag: 0.9 | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
+| `alpine-1.6.0-0.9`  | tag: 0.9 | **`1.6.0`** | Alpine  | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
 
 
 ## :open_file_folder: Docker mounts