Skip to content

Commit 11a62b6

Browse files
Fixed the onbuild versions
Explicitly define the debian version to use for onbuild
1 parent 7fea7b0 commit 11a62b6

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

6/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:6.14.2
1+
FROM node:6.14.2-jessie
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

8/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:8.11.2
1+
FROM node:8.11.2-jessie
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

9/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:9.11.1
1+
FROM node:9.11.1-jessie
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

Dockerfile-onbuild.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:0.0.0
1+
FROM node:0.0.0-jessie
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

update.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,15 @@ function update_node_version() {
5656
fromprefix="${arch}\\/"
5757
fi
5858

59-
sed -Ei -e 's/^FROM (.*)/FROM '"${fromprefix}"'\1/' "${dockerfile}"
60-
sed -Ei -e 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"${version}.${fullVersion:-0}"'/' "${dockerfile}"
59+
nodeVersion="${version}.${fullVersion:-0}"
60+
61+
sed -Ei -e 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "${dockerfile}"
62+
sed -Ei -e 's/^(ENV NODE_VERSION ).*/\1'"${nodeVersion}"'/' "${dockerfile}"
6163
sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}"
6264

65+
# Only for onbuild variant
66+
sed -Ei -e 's/^(FROM .*node:)[^-]*(-.*)/\1'"${nodeVersion}"'\2/' "${dockerfile}"
67+
6368
# shellcheck disable=SC1004
6469
new_line=' \\\
6570
'

0 commit comments

Comments
 (0)