Commit 5e95be64 authored by Benjamin Chodoroff's avatar Benjamin Chodoroff

apply docker fixes from modern-api branch:

fix build

update sharp version
add edge package separately

also fix circleci test routine
parent ad74bfa2
......@@ -9,23 +9,28 @@ jobs:
- run: docker build .
test:
docker:
- image: node:9-alpine
- image: node:10-alpine
steps:
- run:
>
apk add --no-cache
bash build-base fftw-dev git make python
- run:
>
apk add --no-cache
--repository https://dl-3.alpinelinux.org/alpine/edge/main
--repository http://dl-3.alpinelinux.org/alpine/edge/testing
bash build-base fftw-dev git make python vips-dev
vips-dev
- checkout
- restore_cache:
keys:
- node9-dependencies-{{ checksum "yarn.lock" }}
- node9-dependencies-
- node10-dependencies-{{ checksum "yarn.lock" }}
- node10-dependencies-
- run: yarn install --frozen-lockfile
- save_cache:
paths:
- node_modules
key: node9-dependencies-{{ checksum "yarn.lock" }}
key: node10-dependencies-{{ checksum "yarn.lock" }}
- run: yarn test
- store_test_results:
path: reports
......
FROM node:9-alpine as build-stage
FROM node:10-alpine as build-stage
WORKDIR /app
# install build dependencies
RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing \
RUN apk add \
--no-cache \
bash \
build-base \
fftw-dev \
git \
make \
python \
python
RUN apk add \
--no-cache \
--repository https://dl-3.alpinelinux.org/alpine/edge/main \
--repository http://dl-3.alpinelinux.org/alpine/edge/testing \
vips-dev
# install application dependencies
......@@ -26,7 +32,7 @@ RUN make lib ci-test
RUN yarn install --non-interactive --frozen-lockfile --production
# copy built application to runtime image
FROM node:9-alpine
FROM node:10-alpine
WORKDIR /app
RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing \
fftw vips
......
......@@ -24,7 +24,7 @@
"ratelimiter": "^3.0.3",
"redis": "^2.8.0",
"s3-blob-store": "^3.2.0",
"sharp": "^0.20.1",
"sharp": "^0.21.0",
"stream-head": "^1.1.0",
"toml": "^2.3.3"
},
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment