From c6bc44e84afcdb81d9749b7b034c60e916a519ad Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 9 Oct 2019 11:48:10 -0400 Subject: [PATCH] Added multiple versions of alpine --- .travis.yml | 68 +++++++------ 10/alpine3.10/Dockerfile | 95 +++++++++++++++++++ .../docker-entrypoint.sh | 0 10/{alpine => alpine3.9}/Dockerfile | 2 +- .../alpine3.9}/docker-entrypoint.sh | 0 10/architectures | 14 +-- 12/alpine3.10/Dockerfile | 95 +++++++++++++++++++ .../alpine3.10}/docker-entrypoint.sh | 0 12/{alpine => alpine3.9}/Dockerfile | 2 +- .../alpine3.9}/docker-entrypoint.sh | 0 12/architectures | 14 +-- 13/{alpine => alpine3.10}/Dockerfile | 0 13/alpine3.10/docker-entrypoint.sh | 8 ++ 8/alpine3.10/Dockerfile | 95 +++++++++++++++++++ 8/alpine3.10/docker-entrypoint.sh | 8 ++ 8/{alpine => alpine3.9}/Dockerfile | 2 +- 8/alpine3.9/docker-entrypoint.sh | 8 ++ 8/architectures | 14 +-- architectures | 14 +-- functions.sh | 10 ++ generate-stackbrew-library.sh | 9 +- update.sh | 17 ++-- 22 files changed, 404 insertions(+), 71 deletions(-) create mode 100644 10/alpine3.10/Dockerfile rename 10/{alpine => alpine3.10}/docker-entrypoint.sh (100%) rename 10/{alpine => alpine3.9}/Dockerfile (98%) rename {12/alpine => 10/alpine3.9}/docker-entrypoint.sh (100%) create mode 100644 12/alpine3.10/Dockerfile rename {13/alpine => 12/alpine3.10}/docker-entrypoint.sh (100%) rename 12/{alpine => alpine3.9}/Dockerfile (98%) rename {8/alpine => 12/alpine3.9}/docker-entrypoint.sh (100%) rename 13/{alpine => alpine3.10}/Dockerfile (100%) create mode 100755 13/alpine3.10/docker-entrypoint.sh create mode 100644 8/alpine3.10/Dockerfile create mode 100755 8/alpine3.10/docker-entrypoint.sh rename 8/{alpine => alpine3.9}/Dockerfile (98%) create mode 100755 8/alpine3.9/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 9c78b6dd..0055174f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,13 +128,6 @@ jobs: - NODE_VERSION="10" - VARIANT="jessie-slim" - - stage: Build - before_script: *auto_skip - name: 10 on alpine - env: - - NODE_VERSION="10" - - VARIANT="alpine" - - stage: Build before_script: *auto_skip name: 10 on stretch @@ -165,10 +158,17 @@ jobs: - stage: Build before_script: *auto_skip - name: 12 on alpine + name: 10 on alpine3.9 env: - - NODE_VERSION="12" - - VARIANT="alpine" + - NODE_VERSION="10" + - VARIANT="alpine3.9" + + - stage: Build + before_script: *auto_skip + name: 10 on alpine3.10 + env: + - NODE_VERSION="10" + - VARIANT="alpine3.10" - stage: Build before_script: *auto_skip @@ -200,10 +200,17 @@ jobs: - stage: Build before_script: *auto_skip - name: 13 on alpine + name: 12 on alpine3.9 env: - - NODE_VERSION="13" - - VARIANT="alpine" + - NODE_VERSION="12" + - VARIANT="alpine3.9" + + - stage: Build + before_script: *auto_skip + name: 12 on alpine3.10 + env: + - NODE_VERSION="12" + - VARIANT="alpine3.10" - stage: Build before_script: *auto_skip @@ -233,6 +240,13 @@ jobs: - NODE_VERSION="13" - VARIANT="buster-slim" + - stage: Build + before_script: *auto_skip + name: 13 on alpine3.10 + env: + - NODE_VERSION="13" + - VARIANT="alpine3.10" + - stage: Build before_script: *auto_skip name: 8 on jessie @@ -247,20 +261,6 @@ jobs: - NODE_VERSION="8" - VARIANT="jessie-slim" - - stage: Build - before_script: *auto_skip - name: 8 on alpine - env: - - NODE_VERSION="8" - - VARIANT="alpine" - - - stage: Build - before_script: *auto_skip - name: 8 on onbuild - env: - - NODE_VERSION="8" - - VARIANT="onbuild" - - stage: Build before_script: *auto_skip name: 8 on stretch @@ -289,6 +289,20 @@ jobs: - NODE_VERSION="8" - VARIANT="buster-slim" + - stage: Build + before_script: *auto_skip + name: 8 on alpine3.9 + env: + - NODE_VERSION="8" + - VARIANT="alpine3.9" + + - stage: Build + before_script: *auto_skip + name: 8 on alpine3.10 + env: + - NODE_VERSION="8" + - VARIANT="alpine3.10" + - stage: Build before_script: *auto_skip name: chakracore/10 on default diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile new file mode 100644 index 00000000..4e088fcd --- /dev/null +++ b/10/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 10.17.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 \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f893a03c5b51e0c540e32cd52773221a2f9b6d575e7fe79ffe9e878483c703ff" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -fsSLO --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) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fsSLO --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 + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine3.10/docker-entrypoint.sh similarity index 100% rename from 10/alpine/docker-entrypoint.sh rename to 10/alpine3.10/docker-entrypoint.sh diff --git a/10/alpine/Dockerfile b/10/alpine3.9/Dockerfile similarity index 98% rename from 10/alpine/Dockerfile rename to 10/alpine3.9/Dockerfile index 123238ea..7bfe8d21 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/12/alpine/docker-entrypoint.sh b/10/alpine3.9/docker-entrypoint.sh similarity index 100% rename from 12/alpine/docker-entrypoint.sh rename to 10/alpine3.9/docker-entrypoint.sh diff --git a/10/architectures b/10/architectures index 5f77c7cf..162fbcbf 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,stretch,stretch-slim,buster,buster-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim,buster,buster-slim -s390x alpine,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 alpine3.9,alpine3.10 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile new file mode 100644 index 00000000..a23bb5b9 --- /dev/null +++ b/12/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 12.13.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 \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f1c73636c4d345c4aefd65cc959f793d7bb795200d43e19e418d7811670b03dd" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -fsSLO --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) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fsSLO --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 + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/alpine/docker-entrypoint.sh b/12/alpine3.10/docker-entrypoint.sh similarity index 100% rename from 13/alpine/docker-entrypoint.sh rename to 12/alpine3.10/docker-entrypoint.sh diff --git a/12/alpine/Dockerfile b/12/alpine3.9/Dockerfile similarity index 98% rename from 12/alpine/Dockerfile rename to 12/alpine3.9/Dockerfile index ae0bce7e..90d90b65 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/8/alpine/docker-entrypoint.sh b/12/alpine3.9/docker-entrypoint.sh similarity index 100% rename from 8/alpine/docker-entrypoint.sh rename to 12/alpine3.9/docker-entrypoint.sh diff --git a/12/architectures b/12/architectures index 7adab03f..0185a0fd 100644 --- a/12/architectures +++ b/12/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 alpine,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,stretch,stretch-slim,buster,buster-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim,buster,buster-slim -s390x alpine,stretch,stretch-slim,buster,buster-slim +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 alpine3.9,alpine3.10 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 alpine3.9,alpine3.10 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/13/alpine/Dockerfile b/13/alpine3.10/Dockerfile similarity index 100% rename from 13/alpine/Dockerfile rename to 13/alpine3.10/Dockerfile diff --git a/13/alpine3.10/docker-entrypoint.sh b/13/alpine3.10/docker-entrypoint.sh new file mode 100755 index 00000000..de6fa8a9 --- /dev/null +++ b/13/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/alpine3.10/Dockerfile b/8/alpine3.10/Dockerfile new file mode 100644 index 00000000..b0b7637f --- /dev/null +++ b/8/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 8.16.2 + +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 \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="39276723f03e4adaa9f2eeded8653ca6b74d3df23ac70a3455a28c51f0cf0001" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -fsSLO --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) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fsSLO --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 + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/8/alpine3.10/docker-entrypoint.sh b/8/alpine3.10/docker-entrypoint.sh new file mode 100755 index 00000000..de6fa8a9 --- /dev/null +++ b/8/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/alpine/Dockerfile b/8/alpine3.9/Dockerfile similarity index 98% rename from 8/alpine/Dockerfile rename to 8/alpine3.9/Dockerfile index 1822ac37..f9ecccdd 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/8/alpine3.9/docker-entrypoint.sh b/8/alpine3.9/docker-entrypoint.sh new file mode 100755 index 00000000..de6fa8a9 --- /dev/null +++ b/8/alpine3.9/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/architectures b/8/architectures index 11c069bf..39a08d86 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,onbuild,stretch,stretch-slim,buster,buster-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -ppc64le alpine,onbuild,stretch,stretch-slim,buster,buster-slim -s390x alpine,onbuild,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm32v6 alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +i386 jessie,jessie-slim,alpine,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild diff --git a/architectures b/architectures index 64b41647..565bbb7c 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v6 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm64v8 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -ppc64le jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -s390x jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/functions.sh b/functions.sh index 203b08a0..5f37f352 100755 --- a/functions.sh +++ b/functions.sh @@ -169,6 +169,16 @@ function get_versions() { fi } +function is_alpine() { + local variant + variant=${1} + shift + + if [ "${variant}" = "${variant#alpine}" ]; then + return 1 + fi +} + function is_debian() { local variant variant=$1 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5dbe1f12..a29e6e80 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -21,6 +21,8 @@ array_chakracore_10='chakracore-10 chakracore' default_variant=$(get_config "./" "default_variant") +default_alpine=$(get_config "./" "alpine_version") + cd "$(cd "${0%/*}" && pwd -P)" self="$(basename "${BASH_SOURCE[0]}")" @@ -93,11 +95,12 @@ for version in "${versions[@]}"; do variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") if [ "${variant}" = "${default_variant}-slim" ]; then variantAliases+=("${versionAliases[@]/%/-slim}") - fi - variantAliases=("${variantAliases[@]//latest-/}") - if [ "${variant}" = "${default_variant}" ]; then + elif [ "${variant}" = "alpine${default_alpine}" ]; then + variantAliases+=("${versionAliases[@]/%/-alpine}") + elif [ "${variant}" = "${default_variant}" ]; then variantAliases+=("${versionAliases[@]}") fi + variantAliases=("${variantAliases[@]//latest-/}") # Get supported architectures for a specific version and variant. # See details in function.sh diff --git a/update.sh b/update.sh index 6805b96c..8fd0b863 100755 --- a/update.sh +++ b/update.sh @@ -162,16 +162,11 @@ function update_node_version() { sed -Ei -e "/${pattern}/d" "${dockerfile}-tmp" done - if [ "${variant}" = "alpine" ]; then - if [ "${SKIP}" = true ]; then - # Get the currently used Alpine version - alpine_version=$(grep "FROM" "${dockerfile}" | cut -d':' -f2) - checksum=$(grep -o "CHECKSUM=\".*\"" "${dockerfile}" | cut -d'=' -f2) - else - checksum="\"$( - curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 - )\"" - fi + if is_alpine "${variant}"; then + alpine_version="${variant#*alpine}" + checksum="\"$( + curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 + )\"" sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=${checksum}/" "${dockerfile}-tmp" elif is_debian "${variant}"; then @@ -249,6 +244,8 @@ for version in "${versions[@]}"; do template_file="${parentpath}/Dockerfile-debian.template" elif is_debian_slim "${variant}"; then template_file="${parentpath}/Dockerfile-slim.template" + elif is_alpine "${variant}"; then + template_file="${parentpath}/Dockerfile-alpine.template" fi [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"