From 178e7a18a2ddb10acdb9e573441cba174377a2bd Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 4 May 2017 00:03:14 +0800 Subject: [PATCH] Enable curl "--compressed" --- Dockerfile-alpine.template | 6 +++--- Dockerfile-slim.template | 6 +++--- Dockerfile-wheezy.template | 6 +++--- Dockerfile.template | 6 +++--- update.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 460e89b0..bf25ae54 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && 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" \ @@ -56,8 +56,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done \ - && curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ - && curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ + && curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ + && curl -fSL --compressed -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 701956e5..2bb0999c 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -28,7 +28,7 @@ RUN buildDeps='xz-utils' \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && 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-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ @@ -46,8 +46,8 @@ RUN set -ex \ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done \ - && curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ - && curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ + && curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ + && curl -fSL --compressed -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index f49eb9f6..618070c9 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -24,7 +24,7 @@ ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && 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-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ @@ -41,8 +41,8 @@ RUN set -ex \ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done \ - && curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ - && curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ + && curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ + && curl -fSL --compressed -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ diff --git a/Dockerfile.template b/Dockerfile.template index 5901635d..5ba30cb3 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -24,7 +24,7 @@ ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && 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-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ @@ -41,8 +41,8 @@ RUN set -ex \ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done \ - && curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ - && curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ + && curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \ + && curl -fSL --compressed -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ diff --git a/update.sh b/update.sh index 6dcc4975..058e0fc4 100755 --- a/update.sh +++ b/update.sh @@ -13,7 +13,7 @@ versions=( "${versions[@]%/}" ) template= dockerfile= -yarnVersion="$(curl -sSL https://yarnpkg.com/latest-version)" +yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)" function update_node_version { fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep '