Skip to content

fix: downgrade Alpine Linux to 3.13.5 to fix #214 and fix #215 #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -62,7 +63,7 @@ RUN apk add --no-cache \
zlib-dev

RUN cabal v2-update \
&& cabal v2-install erd
&& cabal v2-install erd


# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down
2 changes: 1 addition & 1 deletion README-original.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tests/env_vars.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
33 changes: 25 additions & 8 deletions updatecli/updatecli.d/alpine-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down