Add alpine 3.12 (#77)

home-assistant · Jun 10, 2020 · 7cb9321 · 7cb9321
1 parent 6a9c11b
commit 7cb9321
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -13,22 +13,22 @@ We support version they are not EOL: https://wiki.alpinelinux.org/wiki/Alpine_Li
 
 | Image | OS | Tags | latest |
 |-------|----|------|--------|
-| armhf-base | Alpine | 3.8, 3.9, 3.10, 3.11 | 3.11 |
-| armv7-base | Alpine | 3.9, 3.10, 3.11 | 3.11 |
-| aarch64-base | Alpine | 3.8, 3.9, 3.10, 3.11 | 3.11 |
-| amd64-base | Alpine | 3.8, 3.9, 3.10, 3.11 | 3.11 |
-| i386-base | Alpine | 3.8, 3.9, 3.10, 3.11 | 3.11 |
+| armhf-base | Alpine | 3.9, 3.10, 3.11 3.12 | 3.12 |
+| armv7-base | Alpine | 3.9, 3.10, 3.11 3.12 | 3.12 |
+| aarch64-base | Alpine | 3.9, 3.10, 3.11 3.12 | 3.12 |
+| amd64-base | Alpine | 3.9, 3.10, 3.11 3.12 | 3.12 |
+| i386-base | Alpine | 3.9, 3.10, 3.11 3.12 | 3.12 |
 
 ## Python images
 
 We support the latest 3 release with the latest 2 Alpine version.
 
 | Image | OS | Tags | latest |
 |-------|----|------|--------|
-| armhf-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.10, 3.6-alpine3.11, 3.7-alpine.3.10, 3.7-alpine.3.11, 3.8-alpine3.10, 3.8-alpine3.11 | 3.8-alpine.3.11 |
-| aarch64-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.10, 3.6-alpine3.11, 3.7-alpine.3.10, 3.7-alpine.3.11, 3.8-alpine3.10, 3.8-alpine3.11 | 3.8-alpine.3.11 |
-| amd64-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.10, 3.6-alpine3.11, 3.7-alpine.3.10, 3.7-alpine.3.11, 3.8-alpine3.10, 3.8-alpine3.11 | 3.8-alpine.3.11 |
-| i386-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.10, 3.6-alpine3.11, 3.7-alpine.3.10, 3.7-alpine.3.11, 3.8-alpine3.10, 3.8-alpine3.11 | 3.8-alpine.3.11 |
+| armhf-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.11, 3.6-alpine3.12, 3.7-alpine.3.11, 3.7-alpine.3.12, 3.8-alpine3.11, 3.8-alpine3.12 | 3.8-alpine.3.12 |
+| aarch64-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.11, 3.6-alpine3.12, 3.7-alpine.3.11, 3.7-alpine.3.12, 3.8-alpine3.11, 3.8-alpine3.12 | 3.8-alpine.3.12 |
+| amd64-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.11, 3.6-alpine3.12, 3.7-alpine.3.11, 3.7-alpine.3.12, 3.8-alpine3.11, 3.8-alpine3.12 | 3.8-alpine.3.12 |
+| i386-base-python | Alpine | 3.6, 3.7, 3.8, 3.6-alpine3.11, 3.6-alpine3.12, 3.7-alpine.3.11, 3.7-alpine.3.12, 3.8-alpine3.11, 3.8-alpine3.12 | 3.8-alpine.3.12 |
 
 ## Ubuntu images
 

diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -15,13 +15,9 @@ jobs:
 
 - job: 'Alpine'
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      alpine38:
-        buildVersion: '3.8'
-        buildArch: '--amd64 --i386 --armhf --aarch64'
-        buildArgs: '--no-latest'
       alpine39:
         buildVersion: '3.9'
         buildArch: '--all'
@@ -33,6 +29,10 @@ jobs:
       alpine311:
         buildVersion: '3.11'
         buildArch: '--all'
+        buildArgs: '--no-latest'
+      alpine312:
+        buildVersion: '3.12'
+        buildArch: '--all'
         buildArgs: ''
   steps:
   - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
@@ -51,49 +51,49 @@ jobs:
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '36_Alpine310'
-    version: '3.6=3.10'
+    name: '36_Alpine311'
+    version: '3.6=3.11'
     args: '--no-latest'
 
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '36_Alpine311'
-    version: '3.6=3.11'
+    name: '36_Alpine312'
+    version: '3.6=3.12'
     args: '--no-latest --release-tag'
 
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '37_Alpine310'
-    version: '3.7=3.10'
+    name: '37_Alpine311'
+    version: '3.7=3.11'
     args: '--no-latest'
 
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '37_Alpine311'
-    version: '3.7=3.11'
+    name: '37_Alpine312'
+    version: '3.7=3.12'
     args: '--release-tag --no-latest'
 
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '38_Alpine310'
-    version: '3.8=3.10'
+    name: '38_Alpine311'
+    version: '3.8=3.11'
     args: '--no-latest'
 
 
 - template: .azure/azp-template-python.yml
   parameters:
-    name: '38_Alpine311'
-    version: '3.8=3.11'
+    name: '38_Alpine312'
+    version: '3.8=3.12'
     args: '--release-tag'
 
 
 - job: 'Ubuntu'
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   strategy:
     matrix:
       trusty:
@@ -130,7 +130,7 @@ jobs:
 
 - job: 'Raspbian'
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   strategy:
     matrix:
       stretch:
@@ -157,7 +157,7 @@ jobs:
 
 - job: 'Debian'
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   strategy:
     matrix:
       stretch: