Mohammad Abdolirad 2 роки тому
батько
коміт
15ae6a1e28
6 змінених файлів з 23 додано та 23 видалено
  1. 4 4
      .github/workflows/ci.yml
  2. 2 2
      3.14/Dockerfile
  3. 2 2
      3.15/Dockerfile
  4. 2 2
      3.16/Dockerfile
  5. 2 2
      3.17/Dockerfile
  6. 11 11
      README.md

+ 4 - 4
.github/workflows/ci.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        alpine: [ "3.13.12", "3.14.8", "3.15.6", "3.16.2" ]
+        alpine: [ "3.14.9", "3.15.7", "3.16.4", "3.17.2" ]
         variant: [ "", "openrc" ]
         latest: [ false ]
         include:
-          - alpine: "3.16.2"
+          - alpine: "3.17.2"
             variant: ""
             latest: true
-          - alpine: "3.16.2"
+          - alpine: "3.17.2"
             variant: "openrc"
             latest: true
     steps:
@@ -38,7 +38,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           labels: |
-            maintainer=The Dockage Developers
+            maintainer=The Dockage Authors
           images: |
             dockage/alpine
           flavor: |

+ 2 - 2
3.14/Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.14.8 AS base
+FROM alpine:3.14.9 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 \
     && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-    && apk add --no-cache su-exec ca-certificates
+    && apk add --no-cache --update --upgrade su-exec ca-certificates
 
 FROM base AS openrc
 

+ 2 - 2
3.15/Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.15.6 AS base
+FROM alpine:3.15.7 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 \
     && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-    && apk add --no-cache su-exec ca-certificates
+    && apk add --no-cache --update --upgrade su-exec ca-certificates
 
 FROM base AS openrc
 

+ 2 - 2
3.16/Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.16.2 AS base
+FROM alpine:3.16.4 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 \
     && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-    && apk add --no-cache su-exec ca-certificates
+    && apk add --no-cache --update --upgrade su-exec ca-certificates
 
 FROM base AS openrc
 

+ 2 - 2
3.13/Dockerfile → 3.17/Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.13.12 AS base
+FROM alpine:3.17.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 \
     && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-    && apk add --no-cache su-exec ca-certificates
+    && apk add --no-cache --update --upgrade su-exec ca-certificates
 
 FROM base AS openrc
 

+ 11 - 11
README.md

@@ -1,18 +1,18 @@
-# alpine [![Docker Pulls](https://badgen.net/docker/pulls/dockage/alpine?icon=docker&label=pulls)](https://hub.docker.com/r/dockage/alpine/) [![Docker Stars](https://badgen.net/docker/stars/dockage/alpine?icon=docker&label=stars)](https://hub.docker.com/r/dockage/alpine/) [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/dockage/alpine/CI/master)](https://github.com/dockage/alpine/actions/workflows/ci.yaml)
+# alpine [![Docker Pulls](https://badgen.net/docker/pulls/dockage/alpine?icon=docker&label=pulls)](https://hub.docker.com/r/dockage/alpine/) [![Docker Stars](https://badgen.net/docker/stars/dockage/alpine?icon=docker&label=stars)](https://hub.docker.com/r/dockage/alpine/) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dockage/alpine/ci.yml)](https://github.com/dockage/alpine/actions/workflows/ci.yaml)
 
 [Alpine Linux](https://alpinelinux.org) is a Linux distribution built around [musl libc](https://www.musl-libc.org) and [BusyBox](https://www.busybox.net).
 
 ## Supported tags and respective Dockerfile links
-| 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) |
+| Versions                                                                                                    |                                                                           Size                                                                            |                                                                              Layer                                                                              |
+|:------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| [`3.17.2`, `3.17`, `3`, `latest`](https://github.com/dockage/alpine/blob/master/3.17/Dockerfile)            |        [![Docker Size (3.17)](https://badgen.net/docker/size/dockage/alpine/3.17?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine)        |        [![Docker Layers (3.17)](https://badgen.net/docker/layers/dockage/alpine/3.17?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine)        |
+| [`3.17.2-openrc`, `3.17-openrc`, `3-openrc`](https://github.com/dockage/alpine/blob/master/3.17/Dockerfile) | [![Docker Size (3.17-openrc)](https://badgen.net/docker/size/dockage/alpine/3.17-openrc?icon=docker&label=size)](https://hub.docker.com/r/dockage/alpine) | [![Docker Layers (3.17-openrc)](https://badgen.net/docker/layers/dockage/alpine/3.17-openrc?icon=docker&label=layers)](https://hub.docker.com/r/dockage/alpine) |
+| [`3.16.4`, `3.16`](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.4-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.7` ,`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.7-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.9`, `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.9-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) |
 
 Dockerfile to build an alpine base image with a couple of extra packages and enable some repositories.