Added multiple versions of alpine linux

LaurentGoderre · LaurentGoderre · commit 76be1c7d43b0 · 2018-05-11T14:13:21.000-04:00
Implements #473
diff --git a/.travis.yml b/.travis.yml
@@ -51,7 +51,12 @@ jobs:
     - stage: Build
       env:
          - NODE_VERSION: "10"
-         - VARIANT: "alpine"
+         - VARIANT: "alpine3.6"
+
+    - stage: Build
+      env:
+         - NODE_VERSION: "10"
+         - VARIANT: "alpine3.7"
 
     - stage: Build
       env:
@@ -71,7 +76,7 @@ jobs:
     - stage: Build
       env:
          - NODE_VERSION: "6"
-         - VARIANT: "alpine"
+         - VARIANT: "alpine3.4"
 
     - stage: Build
       env:
@@ -96,7 +101,12 @@ jobs:
     - stage: Build
       env:
          - NODE_VERSION: "8"
-         - VARIANT: "alpine"
+         - VARIANT: "alpine3.6"
+
+    - stage: Build
+      env:
+         - NODE_VERSION: "8"
+         - VARIANT: "alpine3.7"
 
     - stage: Build
       env:
@@ -121,7 +131,12 @@ jobs:
     - stage: Build
       env:
          - NODE_VERSION: "9"
-         - VARIANT: "alpine"
+         - VARIANT: "alpine3.6"
+
+    - stage: Build
+      env:
+         - NODE_VERSION: "9"
+         - VARIANT: "alpine3.7"
 
     - stage: Build
       env:
diff --git a/10/alpine3.6/Dockerfile b/10/alpine3.6/Dockerfile
@@ -0,0 +1,68 @@
+FROM alpine:3.6
+
+ENV NODE_VERSION 10.1.0
+
+RUN addgroup -g 1000 node \
+    && adduser -u 1000 -G node -s /bin/sh -D node \
+    && apk add --no-cache \
+        libstdc++ \
+    && apk add --no-cache --virtual .build-deps \
+        binutils-gold \
+        curl \
+        g++ \
+        gcc \
+        gnupg \
+        libgcc \
+        linux-headers \
+        make \
+        python \
+  # gpg keys listed at https://github.com/nodejs/node#release-team
+  && for key in \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+    77984A986EBC2AA786BC0F66B01FBB92821C587A \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+    && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
+    && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+    && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+    && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+    && tar -xf "node-v$NODE_VERSION.tar.xz" \
+    && cd "node-v$NODE_VERSION" \
+    && ./configure \
+    && make -j$(getconf _NPROCESSORS_ONLN) \
+    && make install \
+    && apk del .build-deps \
+    && cd .. \
+    && rm -Rf "node-v$NODE_VERSION" \
+    && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
+
+ENV YARN_VERSION 1.6.0
+
+RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+  && for key in \
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && mkdir -p /opt \
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && apk del .build-deps-yarn
+
+CMD [ "node" ]
diff --git a/10/alpine3.7/Dockerfile b/10/alpine3.7/Dockerfile
diff --git a/6/alpine3.4/Dockerfile b/6/alpine3.4/Dockerfile
diff --git a/6/architectures b/6/architectures
@@ -1,7 +1,7 @@
 bashbrew-arch   variants
-amd64     default,alpine,onbuild,slim,stretch
-ppc64le default,onbuild,slim,stretch
-s390x default,onbuild,slim,stretch
-arm64v8 default,onbuild,slim,stretch
-arm32v7 default,onbuild,slim,stretch
-i386 default,onbuild,slim,stretch
+amd64     default,alpine3.4,onbuild,slim,stretch
+ppc64le default,alpine3.4,onbuild,slim,stretch
+s390x default,alpine3.4,onbuild,slim,stretch
+arm64v8 default,alpine3.4,onbuild,slim,stretch
+arm32v7 default,alpine3.4,onbuild,slim,stretch
+i386 default,alpine3.4,onbuild,slim,stretch
diff --git a/8/alpine3.6/Dockerfile b/8/alpine3.6/Dockerfile
diff --git a/8/alpine3.7/Dockerfile b/8/alpine3.7/Dockerfile
@@ -0,0 +1,68 @@
+FROM alpine:3.7
+
+ENV NODE_VERSION 8.11.1
+
+RUN addgroup -g 1000 node \
+    && adduser -u 1000 -G node -s /bin/sh -D node \
+    && apk add --no-cache \
+        libstdc++ \
+    && apk add --no-cache --virtual .build-deps \
+        binutils-gold \
+        curl \
+        g++ \
+        gcc \
+        gnupg \
+        libgcc \
+        linux-headers \
+        make \
+        python \
+  # gpg keys listed at https://github.com/nodejs/node#release-team
+  && for key in \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+    77984A986EBC2AA786BC0F66B01FBB92821C587A \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+    && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
+    && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+    && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+    && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+    && tar -xf "node-v$NODE_VERSION.tar.xz" \
+    && cd "node-v$NODE_VERSION" \
+    && ./configure \
+    && make -j$(getconf _NPROCESSORS_ONLN) \
+    && make install \
+    && apk del .build-deps \
+    && cd .. \
+    && rm -Rf "node-v$NODE_VERSION" \
+    && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
+
+ENV YARN_VERSION 1.5.1
+
+RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+  && for key in \
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && mkdir -p /opt \
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && apk del .build-deps-yarn
+
+CMD [ "node" ]
diff --git a/9/alpine3.6/Dockerfile b/9/alpine3.6/Dockerfile
diff --git a/9/alpine3.7/Dockerfile b/9/alpine3.7/Dockerfile
@@ -0,0 +1,68 @@
+FROM alpine:3.7
+
+ENV NODE_VERSION 9.11.1
+
+RUN addgroup -g 1000 node \
+    && adduser -u 1000 -G node -s /bin/sh -D node \
+    && apk add --no-cache \
+        libstdc++ \
+    && apk add --no-cache --virtual .build-deps \
+        binutils-gold \
+        curl \
+        g++ \
+        gcc \
+        gnupg \
+        libgcc \
+        linux-headers \
+        make \
+        python \
+  # gpg keys listed at https://github.com/nodejs/node#release-team
+  && for key in \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+    77984A986EBC2AA786BC0F66B01FBB92821C587A \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+    && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
+    && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+    && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+    && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+    && tar -xf "node-v$NODE_VERSION.tar.xz" \
+    && cd "node-v$NODE_VERSION" \
+    && ./configure \
+    && make -j$(getconf _NPROCESSORS_ONLN) \
+    && make install \
+    && apk del .build-deps \
+    && cd .. \
+    && rm -Rf "node-v$NODE_VERSION" \
+    && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
+
+ENV YARN_VERSION 1.5.1
+
+RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+  && for key in \
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
+  ; do \
+    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && mkdir -p /opt \
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && apk del .build-deps-yarn
+
+CMD [ "node" ]
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:0.0
 
 ENV NODE_VERSION 0.0.0
 
diff --git a/architectures b/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
-amd64     default,alpine,onbuild,slim,stretch
-ppc64le default,alpine,onbuild,slim,stretch
-s390x default,alpine,onbuild,slim,stretch
-arm64v8 default,alpine,onbuild,slim,stretch
+amd64     default,alpine3.6,alpine3.7,onbuild,slim,stretch
+ppc64le default,alpine3.6,alpine3.7,onbuild,slim,stretch
+s390x default,alpine3.6,alpine3.7,onbuild,slim,stretch
+arm64v8 default,alpine3.6,alpine3.7,onbuild,slim,stretch
 arm32v7 default,onbuild,slim,stretch
-arm32v6 alpine
-i386 default,alpine,onbuild,slim,stretch
+arm32v6 alpine3.6,alpine3.7
+i386 default,alpine3.6,alpine3.7,onbuild,slim,stretch
diff --git a/functions.sh b/functions.sh
@@ -62,7 +62,15 @@ function get_variants() {
 
 	arch=$(get_arch)
 	variantsfilter=( "$@" )
-	IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')"
+
+	if [ -a "$dir/architectures" ]; then
+		arch_path="$dir/architectures"
+	else
+
+		arch_path="$(dirname "$dir")/architectures"
+	fi
+
+	IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$arch_path" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')"
 
 	if [ ${#variantsfilter[@]} -gt 0 ]; then
 		for variant1 in "${availablevariants[@]}"; do
diff --git a/test-build.sh b/test-build.sh
@@ -57,7 +57,7 @@ for version in "${versions[@]}"; do
 
   # Get supported variants according to the target architecture.
   # See details in function.sh
-  IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")" "${variant_arg[@]}")"
+  IFS=' ' read -ra variants <<< "$(get_variants "$version" "${variant_arg[@]}")"
 
   # Only build the default Dockerfile if "default" is in the variant list
   if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]] ; then
diff --git a/update.sh b/update.sh
@@ -18,6 +18,30 @@ arch=$(get_arch)
 
 yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)"
 
+function get_template_path {
+	local path=$1
+	shift
+
+	local version=${1:-}
+	shift
+
+	local variant=
+	if [[ $# -eq 1 ]]; then
+		variant=$1
+		shift
+	fi
+
+	if [[ "$version" = chakracore* ]]; then
+		echo "chakracore/Dockerfile.template"
+	elif [ -z "$variant" ]; then
+		echo "$path/Dockerfile.template"
+	elif [[ $variant =~ alpine  ]]; then
+		echo "$path/Dockerfile-alpine.template"
+	else
+		echo "$path/Dockerfile-$variant.template"
+	fi
+}
+
 function update_node_version {
 
 	local baseuri=$1
@@ -61,12 +85,9 @@ function update_node_version {
 			sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak
 		done
 
-		if [[ "${version/.*/}" -ge 10 ]]; then
-			sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "$dockerfile"
-			rm "$dockerfile.bak"
-		elif [[ "${version/.*/}" -ge 8 || "$arch" = "ppc64le" || "$arch" = "s390x" || "$arch" = "arm64" || "$arch" = "arm32v7" ]]; then
-			sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "$dockerfile"
-			rm "$dockerfile.bak"
+		if [[ $variant =~ alpine  ]]; then
+			alpine_version="$(echo "$variant" | sed -En -e "s/alpine([0-9]+.[0-9]+)/\\1/p")"
+			sed -E -i.bak "s/(alpine:)0.0/\\1$alpine_version/" "$dockerfile" && rm "$dockerfile".bak
 		fi
 	)
 }
@@ -99,18 +120,23 @@ for version in "${versions[@]}"; do
 	versionnum=$(basename "$version")
 	baseuri=$(get_config "$parentpath" "baseuri")
 
+	# Fix for chakracore
+	if [[ "$parentpath" = $(dirname "$version")* ]]; then
+		parentpath=$(dirname "$parentpath")
+	fi
+
 	add_stage "$baseuri" "$version" "default"
-	update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" &
+	update_node_version "$baseuri" "$versionnum" "$(get_template_path "$parentpath" "$version")" "$version/Dockerfile" &
 
 	# Get supported variants according the target architecture
 	# See details in function.sh
-	IFS=' ' read -ra variants <<< "$(get_variants "$parentpath")"
+	IFS=' ' read -ra variants <<< "$(get_variants "$parentpath/$version")"
 
 	for variant in "${variants[@]}"; do
 		# Skip non-docker directories
 		[ -f "$version/$variant/Dockerfile" ] || continue
 		add_stage "$baseuri" "$version" "$variant"
-		update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" &
+		update_node_version "$baseuri" "$versionnum" "$(get_template_path "$parentpath" "$version" "$variant")" "$version/$variant/Dockerfile" "$variant" &
 	done
 done
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.4`
	`1`	`+FROM alpine:0.0`
`2`	`2`
`3`	`3`	`ENV NODE_VERSION 0.0.0`
`4`	`4`