Our armv7l build server is back, update config for it.

miss0110 · Oct 19, 2016 · d202afe · d202afe
1 parent bdcbb6b
commit d202afe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/armv7l/Dockerfile b/docker/armv7l/Dockerfile
@@ -1,6 +1,6 @@
 # Get the base image by running the included `mkimage-alpine.sh` script, or
 # get a fresh copy from github.com/docker/docker/contrib/.
-FROM alpine:edge
+FROM alpine:3.4
 
 # Copy app source.
 COPY . /tmp/build/
@@ -15,11 +15,11 @@ ENV PATH /app/bin:$PATH
 # Node build taken from https://github.com/mhart/alpine-node and slightly adapted.
 RUN set -xo pipefail && \
     echo '--- Updating repositories' && \
-    echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
+    echo '@community http://nl.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && \
     apk update && \
     echo '--- Building node' && \
     apk add curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ && \
-    curl -sSL https://nodejs.org/dist/v6.7.0/node-v6.7.0.tar.gz | tar -xz && \
+    curl -sSL https://nodejs.org/dist/v6.9.0/node-v6.9.0.tar.gz | tar -xz && \
     cd /node-v* && \
     ./configure --prefix=/usr && \
     make -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
@@ -32,7 +32,7 @@ RUN set -xo pipefail && \
     cd /tmp/build && \
     export PATH=$PWD/node_modules/.bin:$PATH && \
     sed -i'' -e '/phantomjs/d' package.json && \
-    apk add git zeromq-dev protobuf-dev graphicsmagick@testing && \
+    apk add git zeromq-dev protobuf-dev graphicsmagick@community && \
     export JOBS=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
     echo 'npm install --no-optional' | su stf -s /bin/sh && \
     echo '--- Assembling app' && \

diff --git a/docker/armv7l/[email protected] b/docker/armv7l/[email protected]
@@ -10,5 +10,5 @@ After=stf-armv7l-clone@%i.service
 Type=oneshot
 WorkingDirectory=/home/stf-armv7l/repo-%i
 Environment="ARCH=armhf"
-ExecStart=/bin/sh docker/armv7l/mkimage-alpine.sh -r edge -i alpine-stf-armv7l-%i:edge
-ExecStart=/usr/bin/sed -i.bak 's/FROM alpine:edge/FROM alpine-stf-armv7l-%i:edge/' docker/armv7l/Dockerfile
+ExecStart=/bin/sh docker/armv7l/mkimage-alpine.sh -r v3.4 -i alpine-stf-armv7l-%i:3.4
+ExecStart=/usr/bin/sed -i.bak 's/FROM alpine:3.4/FROM alpine-stf-armv7l-%i:3.4/' docker/armv7l/Dockerfile