Merge pull request #359 from wjordan/alpine-packaging-test

Use libvips-dev apk for alpine-linux packaging test
This commit is contained in:
Lovell Fuller 2016-02-13 20:37:21 +00:00
commit cd05c7814a
2 changed files with 4 additions and 4 deletions

View File

@ -51,7 +51,7 @@ fi
# Alpine # Alpine
echo "Testing alpine..." echo "Testing alpine..."
if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" wjordan/libvips >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test"; if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" alpine:edge >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test";
then echo "alpine OK" then echo "alpine OK"
else echo "alpine fail" && cat packaging/alpine.log else echo "alpine fail" && cat packaging/alpine.log
fi fi

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# Install Node.js # Install build dependencies
apk add --update make gcc g++ python nodejs apk add --update make gcc g++ python nodejs
# Install libvips dependencies # Install libvips with build headers and dependencies
apk add --update glib-dev libpng libwebp libexif libxml2 orc fftw lcms2 apk add libvips-dev --update --repository https://s3.amazonaws.com/wjordan-apk --allow-untrusted