Merge pull request #216 from dduportal/feat/downgrad-alpine-313

fix: downgrade Alpine Linux to 3.13.5 to fix #214 and fix #215
asciidoctor · Aug 2, 2021 · d21e65a · d21e65a
2 parents fcd1bbc + 3a8def0
commit d21e65a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:3.14.0 AS base
+ARG alpine_version=3.13.5
+FROM alpine:${alpine_version} AS base
 
 ARG asciidoctor_version=2.0.15
 ARG asciidoctor_confluence_version=0.0.2
@@ -62,7 +63,7 @@ RUN apk add --no-cache \
     zlib-dev
 
 RUN cabal v2-update \
- && cabal v2-install erd
+  && cabal v2-install erd
 
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

diff --git a/README-original.adoc b/README-original.adoc
@@ -22,7 +22,7 @@ This Docker image provides:
 * https://github.com/asciidoctor/asciidoctor-confluence[Asciidoctor Confluence] {ASCIIDOCTOR_CONFLUENCE_VERSION}
 * https://github.com/asciidoctor/asciidoctor-bibtex[Asciidoctor Bibtex] {ASCIIDOCTOR_BIBTEX_VERSION}
 
-This image uses Alpine Linux 3.13 as base image.
+This image uses Alpine Linux {ALPINE_VERSION} as base image.
 
 == How to use it
 

diff --git a/README.adoc b/README.adoc
@@ -1,3 +1,4 @@
+:ALPINE_VERSION: 3.13.5
 :ASCIIDOCTOR_VERSION: 2.0.15
 :ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2
 :ASCIIDOCTOR_PDF_VERSION: 1.6.0
@@ -6,7 +7,7 @@
 :ASCIIDOCTOR_FB2_VERSION: 0.5.1
 :ASCIIDOCTOR_MATHEMATICAL_VERSION: 0.3.5
 :ASCIIDOCTOR_REVEALJS_VERSION: 4.1.0
-:KRAMDOWN_ASCIIDOC_VERSION: 1.0.1
+:KRAMDOWN_ASCIIDOC_VERSION: 2.0.0
 :ASCIIDOCTOR_BIBTEX_VERSION: 0.8.0
 = Asciidoctor Docker Container
 :source-highlighter: coderay
@@ -32,7 +33,7 @@ This Docker image provides:
 * https://github.com/asciidoctor/asciidoctor-confluence[Asciidoctor Confluence] {ASCIIDOCTOR_CONFLUENCE_VERSION}
 * https://github.com/asciidoctor/asciidoctor-bibtex[Asciidoctor Bibtex] {ASCIIDOCTOR_BIBTEX_VERSION}
 
-This image uses Alpine Linux 3.13 as base image.
+This image uses Alpine Linux {ALPINE_VERSION} as base image.
 
 == How to use it
 

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ This Docker image provides:
 
 -   [Asciidoctor Bibtex](https://github.com/asciidoctor/asciidoctor-bibtex) 0.8.0
 
-This image uses Alpine Linux 3.13 as base image.
+This image uses Alpine Linux 3.13.5 as base image.
 
 ## How to use it
 

diff --git a/tests/env_vars.yml b/tests/env_vars.yml
@@ -1,5 +1,6 @@
 ## This file holds the environement variables for the test harness
 # Only key/value at level 0 are allowed
+ALPINE_VERSION: 3.13.5
 ASCIIDOCTOR_VERSION: 2.0.15
 ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2
 ASCIIDOCTOR_PDF_VERSION: 1.6.0

diff --git a/updatecli/updatecli.d/alpine-linux.yml b/updatecli/updatecli.d/alpine-linux.yml
@@ -10,33 +10,50 @@ sources:
       token: "{{ requiredEnv .github.token }}"
       username: "{{ .github.username }}"
       versionFilter:
-        kind: latest
+        kind: regex
+        pattern: '3.13.(\d*)'
     transformers:
       - trimPrefix: "v"
 conditions:
-  testDockerfileFrom:
-    name: "Does the Dockerfile have a FROM instruction which image is alpine?"
+  testDockerfileArg:
+    name: "Does the Dockerfile have an ARG instruction for the Alpine Linux version?"
     kind: dockerfile
     spec:
       file: Dockerfile
       instruction:
-        keyword: "FROM"
-        matcher: "alpine"
+        keyword: "ARG"
+        matcher: "alpine_version"
   testDockerImageExists:
     name: "Does the Docker Image exists on the Docker Hub?"
     kind: dockerImage
     spec:
       image: "alpine"
 targets:
   updateDockerfileArgVersion:
-    name: "Update the value of the base image (FROM) in the Dockerfile"
+    name: "Update the value of the base image (ARG alpine_version) in the Dockerfile"
     sourceID: getAlpineLinuxVersion
     kind: dockerfile
     spec:
       file: Dockerfile
       instruction:
-        keyword: "FROM"
-        matcher: "alpine"
+        keyword: "ARG"
+        matcher: "alpine_version"
+    scm:
+      github:
+        user: "{{ .github.user }}"
+        email: "{{ .github.email }}"
+        owner: "{{ requiredEnv .github.owner }}"
+        repository: "{{ requiredEnv .github.repository }}"
+        token: "{{ requiredEnv .github.token }}"
+        username: "{{ .github.username }}"
+        branch: "{{ .github.branch }}"
+  updateHarnessEnvAlpineVersion:
+    name: "Update the key ALPINE_VERSION in the test harness env_vars.yml file"
+    kind: yaml
+    sourceID: getAlpineLinuxVersion
+    spec:
+      file: "tests/env_vars.yml"
+      key: "ALPINE_VERSION"
     scm:
       github:
         user: "{{ .github.user }}"