nodejs
/
docker-node
mirror of https://github.com/nodejs/docker-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support s390x architecture (#490) 

- Support `s390x` in all of the version except 4.8 and the following
  variants: default, alpine, stretch and onbuild
- Generate proper `architectures` for the stackbrew
- Update `update.sh` in order to be used on s390x
- `s390` is not supported in v4.8, therefore, add a local architectures
  under 4.8 and remove `s390x` there

Signed-off-by: Yihong Wang <yh.wang@ibm.com>
This commit is contained in:
Yihong Wang 2017-08-09 02:13:50 -07:00 committed by Simen Bekkhus
parent 1a86465462
commit d001b4cfef
7 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
4.8/architectures Normal file
View File

@ -0,0 +1,3 @@
bashbrew-arch variants
amd64 default,alpine,onbuild,slim,stretch,wheezy
ppc64le default,onbuild,slim,stretch

1
Dockerfile-slim.template
View File

@ -28,6 +28,7 @@ RUN buildDeps='xz-utils' \
&& case "${dpkgArch##*-}" in \ && case "${dpkgArch##*-}" in \
amd64) ARCH='x64';; \ amd64) ARCH='x64';; \
ppc64el) ARCH='ppc64le';; \ ppc64el) ARCH='ppc64le';; \
s390x) ARCH='s390x';; \
*) echo "unsupported architecture"; exit 1 ;; \ *) echo "unsupported architecture"; exit 1 ;; \
esac \ esac \
&& set -x \ && set -x \

1
Dockerfile-stretch.template
View File

@ -27,6 +27,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \ && case "${dpkgArch##*-}" in \
amd64) ARCH='x64';; \ amd64) ARCH='x64';; \
ppc64el) ARCH='ppc64le';; \ ppc64el) ARCH='ppc64le';; \
s390x) ARCH='s390x';; \
*) echo "unsupported architecture"; exit 1 ;; \ *) echo "unsupported architecture"; exit 1 ;; \
esac \ esac \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

1
Dockerfile.template
View File

@ -27,6 +27,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \ && case "${dpkgArch##*-}" in \
amd64) ARCH='x64';; \ amd64) ARCH='x64';; \
ppc64el) ARCH='ppc64le';; \ ppc64el) ARCH='ppc64le';; \
s390x) ARCH='s390x';; \
*) echo "unsupported architecture"; exit 1 ;; \ *) echo "unsupported architecture"; exit 1 ;; \
esac \ esac \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

1
architectures
View File

@ -1,3 +1,4 @@
bashbrew-arch variants bashbrew-arch variants
amd64 default,alpine,onbuild,slim,stretch,wheezy amd64 default,alpine,onbuild,slim,stretch,wheezy
ppc64le default,onbuild,slim,stretch ppc64le default,onbuild,slim,stretch
s390x default,onbuild,slim,stretch

2
functions.sh
View File

@ -37,7 +37,7 @@ function get_variants() {
local arch local arch
arch=$(get_arch) arch=$(get_arch)
local variants local variants
variants=$(grep "$arch" architectures | sed -E 's/'"$arch"'\s*//' | sed -E 's/,/ /g') variants=$(grep "^$arch" architectures | sed -E 's/'"$arch"'\s*//' | sed -E 's/,/ /g')
echo "$variants" echo "$variants"
} }

2
update.sh
View File

@ -42,7 +42,7 @@ function update_node_version {
sed -E -i.bak 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "$dockerfile" && rm "$dockerfile".bak
sed -E -i.bak 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"$version.$fullVersion"'/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"$version.$fullVersion"'/' "$dockerfile" && rm "$dockerfile".bak
sed -E -i.bak 's/^(ENV YARN_VERSION ).*/\1'"$yarnVersion"'/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV YARN_VERSION ).*/\1'"$yarnVersion"'/' "$dockerfile" && rm "$dockerfile".bak
if [[ "${version/.*/}" -ge 8 || "$arch" = "ppc64le" ]]; then if [[ "${version/.*/}" -ge 8 || "$arch" = "ppc64le" || "$arch" = "s390x" ]]; then
sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "$dockerfile" sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "$dockerfile"
rm "$dockerfile.bak" rm "$dockerfile.bak"
fi fi