Bladeren bron

Upgrade Alpine base images (#11)

* Upgrade Alpine base images

* Disable latest flavor

* Fix the latest version

* Remove variant from latest version

* Add variant

* Debug latest

* Debug variant

* Debug include

* Fix the latest version

* Update versions table
Mohammad Abdolirad 2 jaren geleden
bovenliggende
commit
87c15890ee
6 gewijzigde bestanden met toevoegingen van 34 en 21 verwijderingen
  1. 20 7
      .github/workflows/ci.yml
  2. 1 1
      3.13/Dockerfile
  3. 1 1
      3.14/Dockerfile
  4. 1 1
      3.15/Dockerfile
  5. 1 1
      3.16/Dockerfile
  6. 10 10
      README.md

+ 20 - 7
.github/workflows/ci.yml

@@ -11,13 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        alpine: [ "3.13.10", "3.14.6", "3.15.4", "3.16.1" ]
+        alpine: [ "3.13.12", "3.14.8", "3.15.6", "3.16.2" ]
         variant: [ "", "openrc" ]
         latest: [ false ]
         include:
-          - alpine: 3.16.1
+          - alpine: "3.16.2"
             variant: ""
             latest: true
+          - alpine: "3.16.2"
+            variant: "openrc"
+            latest: true
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -37,12 +40,22 @@ jobs:
             maintainer=The Dockage Developers
           images: |
             dockage/alpine
+          flavor: |
+            latest=false
+            suffix=${{ format(matrix.variant != '' && '-{0}' || '', matrix.variant) }}
           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 }}
+            ### versioning strategy
+            # dockage/alpine:3.16.2
+            # dockage/alpine:3.16
+            # dockage/alpine:3
+            # dockage/alpine:3.16.2-openrc
+            # dockage/alpine:3.16-openrc
+            # dockage/alpine:3-openrc
+            # dockage/alpine:latest
+            type=semver,pattern={{version}},value=${{ matrix.alpine }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ matrix.alpine }}
+            type=semver,pattern={{major}},value=${{ matrix.alpine }},enable=${{ matrix.latest }}
+            type=raw,value=latest,suffix=,enable=${{ matrix.latest && matrix.variant == '' }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

+ 1 - 1
3.13/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13.10 AS base
+FROM alpine:3.13.12 AS base
 
 RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
     && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \

+ 1 - 1
3.14/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14.6 AS base
+FROM alpine:3.14.8 AS base
 
 RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
     && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \

+ 1 - 1
3.15/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.15.4 AS base
+FROM alpine:3.15.6 AS base
 
 RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
     && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \

+ 1 - 1
3.16/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16.1 AS base
+FROM alpine:3.16.2 AS base
 
 RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
     && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \

+ 10 - 10
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.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?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?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?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?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?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?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?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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| Versions                                                                                          |                                                                    Size                                                                                     |                                                                                 Layer                                                                                 |
+|:--------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| [`3.16.2`, `3.16`, `3`, `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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)           |
+| [`3.16.2-openrc`, `3.16-openrc`, `3-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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.15.6` ,`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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.15.6-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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.14.8`, `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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.14.8-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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.13.12`, `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?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.13.12-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?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.