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

Revert "Enable ccache for Alpine builds on Travis CI" and "Fix Alpine build with the missing `|| true`" 

This reverts commits 2893221564 and 7e5b3f07e6.
This commit is contained in:
Tianon Gravi 2018-11-22 10:09:39 -08:00
parent b9a24d8889
commit 77c2d0850a
8 changed files with 0 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.travis.yml
View File

@ -30,16 +30,6 @@ services:
echo "Skip build of $Dockerfile as it's not changed." echo "Skip build of $Dockerfile as it's not changed."
exit exit
fi fi
if [ "alpine" = "$VARIANT" ]; then
mkdir -p ccache
(
cd ccache
ls -l
md5sum *
nc -v -l -p 5678 -q 1 < cache.tgz &
nc -v -l -p 1234 -q 1 > new-cache.tgz &
)
fi
script: ./test-build.sh $NODE_VERSION $VARIANT script: ./test-build.sh $NODE_VERSION $VARIANT
@ -126,16 +116,6 @@ jobs:
- NODE_VERSION: "10" - NODE_VERSION: "10"
- VARIANT: "alpine" - VARIANT: "alpine"
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/
- stage: Build - stage: Build
before_script: *auto_skip before_script: *auto_skip
env: env:
@ -154,16 +134,6 @@ jobs:
- NODE_VERSION: "11" - NODE_VERSION: "11"
- VARIANT: "alpine" - VARIANT: "alpine"
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/
- stage: Build - stage: Build
before_script: *auto_skip before_script: *auto_skip
env: env:
@ -188,16 +158,6 @@ jobs:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "alpine" - VARIANT: "alpine"
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/
- stage: Build - stage: Build
before_script: *auto_skip before_script: *auto_skip
env: env:
@ -228,16 +188,6 @@ jobs:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "alpine" - VARIANT: "alpine"
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/
- stage: Build - stage: Build
before_script: *auto_skip before_script: *auto_skip
env: env:

11
10/alpine/Dockerfile
View File

@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
ccache \
netcat-openbsd \
gnupg \ gnupg \
libgcc \ libgcc \
linux-headers \ linux-headers \
@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \ && tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \ && cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \ && ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \ && apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \ && cd .. \
&& rm -Rf "node-v$NODE_VERSION" \ && rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

11
11/alpine/Dockerfile
View File

@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
ccache \
netcat-openbsd \
gnupg \ gnupg \
libgcc \ libgcc \
linux-headers \ linux-headers \
@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \ && tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \ && cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \ && ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \ && apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \ && cd .. \
&& rm -Rf "node-v$NODE_VERSION" \ && rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

11
6/alpine/Dockerfile
View File

@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
ccache \
netcat-openbsd \
gnupg \ gnupg \
libgcc \ libgcc \
linux-headers \ linux-headers \
@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \ && tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \ && cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \ && ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \ && apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \ && cd .. \
&& rm -Rf "node-v$NODE_VERSION" \ && rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

11
8/alpine/Dockerfile
View File

@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
ccache \
netcat-openbsd \
gnupg \ gnupg \
libgcc \ libgcc \
linux-headers \ linux-headers \
@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \ && tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \ && cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \ && ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \ && apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \ && cd .. \
&& rm -Rf "node-v$NODE_VERSION" \ && rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

11
Dockerfile-alpine.template
View File

@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
ccache \
netcat-openbsd \
gnupg \ gnupg \
libgcc \ libgcc \
linux-headers \ linux-headers \
@ -32,19 +30,10 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \ && tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \ && cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \ && ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \ && apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \ && cd .. \
&& rm -Rf "node-v$NODE_VERSION" \ && rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

10
travis.yml.template
View File

@ -28,16 +28,6 @@ services:
echo "Skip build of $Dockerfile as it's not changed." echo "Skip build of $Dockerfile as it's not changed."
exit exit
fi fi
if [ "alpine" = "$VARIANT" ]; then
mkdir -p ccache
(
cd ccache
ls -l
md5sum *
nc -v -l -p 5678 -q 1 < cache.tgz &
nc -v -l -p 1234 -q 1 > new-cache.tgz &
)
fi
script: ./test-build.sh $NODE_VERSION $VARIANT script: ./test-build.sh $NODE_VERSION $VARIANT

12
update.sh
View File

@ -192,18 +192,6 @@ function add_stage() {
env: env:
- NODE_VERSION: "'"${version}"'" - NODE_VERSION: "'"${version}"'"
- VARIANT: "'"${variant}"'"' >> .travis.yml - VARIANT: "'"${variant}"'"' >> .travis.yml
if [ "alpine" = "${variant}" ]; then
echo '
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/' >> .travis.yml
fi
} }
echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED #