Merge pull request #7 from dockage/add-minor-versions

Add minor version tags

.github/workflows/ci.yml

@@ -11,17 +11,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        alpine: [ "3.13", "3.14", "3.15", "3.16" ]
+        alpine: [ "3.13.10", "3.14.6", "3.15.4", "3.16.1" ]
         variant: [ "", "openrc" ]
         latest: [ false ]
         include:
-          - alpine: 3.16
+          - alpine: 3.16.1
             variant: ""
             latest: true
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - uses: actions/github-script@v6
+        id: alpine-minor-version
+        with:
+          # The script returns 1.15 from 1.15.10
+          script: return "${{ matrix.alpine }}".substr(0, "${{ matrix.alpine }}".lastIndexOf("."))
+          result-encoding: string
+
       - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v4
@@ -32,7 +39,9 @@ jobs:
             dockage/alpine
           tags: |
             type=raw,value=${{ matrix.alpine }},enable=${{ matrix.variant == '' }}
+            type=raw,value=${{steps.alpine-minor-version.outputs.result}},enable=${{ matrix.variant == '' }}
             type=raw,value=${{ matrix.alpine }}-${{ matrix.variant }},enable=${{ matrix.variant != '' }}
+            type=raw,value=${{steps.alpine-minor-version.outputs.result}}-${{ matrix.variant }},enable=${{ matrix.variant != '' }}
             type=raw,value=latest,enable=${{ matrix.latest }}
 
       - name: Set up Docker Buildx
@@ -54,7 +63,7 @@ jobs:
             ./docker-bake.hcl
             ${{ steps.meta.outputs.bake-file }}
         env:
-          CONTEXT: ${{ matrix.alpine }}
+          CONTEXT: ${{steps.alpine-minor-version.outputs.result}}
 
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v3

README.md

@@ -2,16 +2,16 @@
 
 [Alpine Linux](https://alpinelinux.org) is a Linux distribution built around [musl libc](https://www.musl-libc.org) and [BusyBox](https://www.busybox.net).
 
-|                                              Versions                                               |                                                                    Size                                                                     |                                                                                 Layer                                                                                 |
-|:---------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|      `3.13` ([3.13/Dockerfile](https://github.com/dockage/alpine/blob/master/3.13/Dockerfile))      | [![Docker Size (3.13)](https://badgen.net/docker/size/dockage/alpine/3.13?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) |        [![Docker Layers (3.13)](https://badgen.net/docker/layers/dockage/alpine/3.13/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
-|  `3.13-openrc` ([3.13/Dockerfile](https://github.com/dockage/alpine/blob/master/3.13/Dockerfile))   |   [![MicroBadger Size (3.13-openrc)](https://badgen.net/docker/size/dockage/alpine/3.13-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)   | [![Docker Layers (3.13-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.13-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
-|      `3.14` ([3.14/Dockerfile](https://github.com/dockage/alpine/blob/master/3.14/Dockerfile))      | [![Docker Size (3.14)](https://badgen.net/docker/size/dockage/alpine/3.14?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) |        [![Docker Layers (3.14)](https://badgen.net/docker/layers/dockage/alpine/3.14/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
-|  `3.14-openrc` ([3.14/Dockerfile](https://github.com/dockage/alpine/blob/master/3.14/Dockerfile))   |   [![MicroBadger Size (3.14-openrc)](https://badgen.net/docker/size/dockage/alpine/3.14-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)   | [![Docker Layers (3.14-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.14-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
-|      `3.15` ([3.15/Dockerfile](https://github.com/dockage/alpine/blob/master/3.15/Dockerfile))      | [![Docker Size (3.15)](https://badgen.net/docker/size/dockage/alpine/3.15?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) |        [![Docker Layers (3.15)](https://badgen.net/docker/layers/dockage/alpine/3.15/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
-|  `3.15-openrc` ([3.15/Dockerfile](https://github.com/dockage/alpine/blob/master/3.15/Dockerfile))   |   [![MicroBadger Size (3.15-openrc)](https://badgen.net/docker/size/dockage/alpine/3.15-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)   | [![Docker Layers (3.15-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.15-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
-| `3.16`, `latest` ([3.16/Dockerfile](https://github.com/dockage/alpine/blob/master/3.16/Dockerfile)) | [![Docker Size (3.16)](https://badgen.net/docker/size/dockage/alpine/3.16?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) |        [![Docker Layers (3.16)](https://badgen.net/docker/layers/dockage/alpine/3.16/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
-|  `3.16-openrc` ([3.16/Dockerfile](https://github.com/dockage/alpine/blob/master/3.16/Dockerfile))   |   [![MicroBadger Size (3.16-openrc)](https://badgen.net/docker/size/dockage/alpine/3.16-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)   | [![Docker Layers (3.16-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.16-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| Versions                                                                                      |                                                                    Size                                                                                     |                                                                                 Layer                                                                                 |
+|:----------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| [`3.16.1`, `3.16`, `latest`](https://github.com/dockage/alpine/blob/master/3.16/Dockerfile) | [![Docker Size (3.16)](https://badgen.net/docker/size/dockage/alpine/3.16?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)                 |        [![Docker Layers (3.16)](https://badgen.net/docker/layers/dockage/alpine/3.16/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.16.1-openrc`, `3.16-openrc`](https://github.com/dockage/alpine/blob/master/3.16/Dockerfile) |   [![Docker Size (3.16-openrc)](https://badgen.net/docker/size/dockage/alpine/3.16-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) | [![Docker Layers (3.16-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.16-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.15.4` ,`3.15`](https://github.com/dockage/alpine/blob/master/3.15/Dockerfile) | [![Docker Size (3.15)](https://badgen.net/docker/size/dockage/alpine/3.15?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)                 |        [![Docker Layers (3.15)](https://badgen.net/docker/layers/dockage/alpine/3.15/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.15.4-openrc`, `3.15-openrc`](https://github.com/dockage/alpine/blob/master/3.15/Dockerfile) |   [![Docker Size (3.15-openrc)](https://badgen.net/docker/size/dockage/alpine/3.15-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) | [![Docker Layers (3.15-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.15-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.14.6`, `3.14`](https://github.com/dockage/alpine/blob/master/3.14/Dockerfile) | [![Docker Size (3.14)](https://badgen.net/docker/size/dockage/alpine/3.14?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)                 |        [![Docker Layers (3.14)](https://badgen.net/docker/layers/dockage/alpine/3.14/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.14.6-openrc`, `3.14-openrc`](https://github.com/dockage/alpine/blob/master/3.14/Dockerfile) |   [![Docker Size (3.14-openrc)](https://badgen.net/docker/size/dockage/alpine/3.14-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) | [![Docker Layers (3.14-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.14-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.13.10`, `3.13`](https://github.com/dockage/alpine/blob/master/3.13/Dockerfile) | [![Docker Size (3.13)](https://badgen.net/docker/size/dockage/alpine/3.13?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)                 |        [![Docker Layers (3.13)](https://badgen.net/docker/layers/dockage/alpine/3.13/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.13.10-openrc`, `3.13-openrc`](https://github.com/dockage/alpine/blob/master/3.13/Dockerfile) |   [![Docker Size (3.13-openrc)](https://badgen.net/docker/size/dockage/alpine/3.13-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) | [![Docker Layers (3.13-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.13-openrc/amd64?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
 
 Dockerfile to build an alpine base image with a couple of extra packages and enable some repositories.