diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e70320..65dbe8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +# image: node:7.10.0 + stages: - setup # - test @@ -10,31 +12,31 @@ cache: - node_modules/ setup: - image: node:alpine + image: node stage: setup script: - - npm ci + - npm install # test:unit: -# image: node:alpine +# image: node # stage: test # script: # - npm run test:unit # test:e2e: -# image: node:alpine +# image: node # stage: test # script: # - npm run test:e2e ts:lint: - image: node:alpine + image: node stage: lint script: - npm run lint:ts sass:lint: - image: node:alpine + image: node stage: lint script: - npm run lint:sass diff --git a/Dockerfile b/Dockerfile index 65fe7a2..b62377b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ FROM node:alpine RUN apk add --no-cache libpng-dev gcc make g++ zlib-dev bash lcms2-dev autoconf automake libtool nasm WORKDIR /app COPY package.json package-lock.json ./ -COPY .env.sample .env -RUN source .env RUN npm ci COPY . ./