Skip to content

Commit 208f195

Browse files
Merge pull request #745 from LaurentGoderre/improve-alpine-template
Simplify the management of alpine version
2 parents 4166cc4 + 9bd00c4 commit 208f195

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.4
1+
FROM alpine:0.0
22

33
ENV NODE_VERSION 0.0.0
44

config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
baseuri https://nodejs.org/dist
2+
alpine_version 3.7

update.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function update_node_version() {
4242
shift
4343
local dockerfile=$1
4444
shift
45-
local variant
45+
local variant=""
4646
if [ $# -eq 1 ]; then
4747
variant=$1
4848
shift
@@ -73,10 +73,9 @@ function update_node_version() {
7373
sed -Ei -e "/${pattern}/d" "${dockerfile}"
7474
done
7575

76-
if [ "${version/.*/}" -ge 10 ]; then
77-
sed -Ei -e 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "${dockerfile}"
78-
elif [ "${version/.*/}" -ge 8 ] || [ "$arch" = "ppc64le" ] || [ "$arch" = "s390x" ] || [ "$arch" == "arm64" ] || [ "$arch" == "arm32v7" ]; then
79-
sed -Ei -e 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "${dockerfile}"
76+
if [ "${variant}" = "alpine" ]; then
77+
alpine_version=$(get_config "./" "alpine_version")
78+
sed -Ei "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}"
8079
fi
8180
)
8281
}

0 commit comments

Comments
 (0)