Skip to content

Commit

Permalink
Merge pull request #23 from cytopia/fix-makefile
Browse files Browse the repository at this point in the history 
Fix makefile
  • Loading branch information
@cytopia
cytopia authored Oct 23, 2022
2 parents 35a8cf3 + e14df2f commit 8189613
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ build: ARGS=--build-arg VERSION=$(VERSION)
build: docker-arch-build

.PHONY: rebuild
build: ARGS=--build-arg VERSION=$(VERSION)
rebuild: ARGS=--build-arg VERSION=$(VERSION)
rebuild: docker-arch-rebuild

.PHONY: push
Expand Down
28 changes: 14 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ The following Docker image tags are rolling releases and are built and updated e
[![nightly](https://github.com/cytopia/docker-jsonlint/workflows/nightly/badge.svg)](https://github.com/cytopia/docker-jsonlint/actions?query=workflow%3Anightly)


| Docker Tag | Git Ref | Jsonlint | Flavour | Available Architectures |
|----------------------|-----------|-------------|---------|----------------------------------------------|
| `latest` | master | latest | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine` | master | latest | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| | | | | |
| `1.6.0` | master | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-1.6.0` | master | **`1.6.0`** | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| Docker Tag | Git Ref | Jsonlint | Flavour | Available Architectures |
|----------------------|-----------|--------------|---------|----------------------------------------------|
| `latest` | master | latest | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine` | master | latest | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| | | | | |
| `1.6.0` | master | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-1.6.0` | master | **`1.6.0`** | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |

#### Point in time releases

Expand All @@ -79,13 +79,13 @@ The following Docker image tags are built once and can be used for reproducible
[![build](https://github.com/cytopia/docker-jsonlint/workflows/build/badge.svg)](https://github.com/cytopia/docker-jsonlint/actions?query=workflow%3Abuild)


| Docker Tag | Git Ref | Jsonlint | Flavour | Available Architectures |
|----------------------|-----------|-------------|---------|----------------------------------------------|
| `latest-0.11` | tag: 0.11 | latest | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-latest-0.11` | tag: 0.11 | latest | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| | | | | |
| `1.6.0-0.11` | tag: 0.11 | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-1.6.0-0.11` | tag: 0.11 | **`1.6.0`** | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| Docker Tag | Git Ref | Jsonlint | Flavour | Available Architectures |
|----------------------|-----------|--------------|---------|----------------------------------------------|
| `latest-0.11` | tag: 0.11 | latest | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-latest-0.11` | tag: 0.11 | latest | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| | | | | |
| `1.6.0-0.11` | tag: 0.11 | **`1.6.0`** | default | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |
| `alpine-1.6.0-0.11` | tag: 0.11 | **`1.6.0`** | Alpine | `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6` |


## :open_file_folder: Docker mounts
Expand Down

0 comments on commit 8189613

Please sign in to comment.