Commit 538afd05 authored by David Burke's avatar David Burke

updating docker things

parent 644824b2
Pipeline #37722646 failed with stage
in 8 minutes and 11 seconds
image: registry.gitlab.com/dasch8/angular-ci:latest
image: node:11-alpine
variables:
DOCKER_DRIVER: overlay2
......@@ -13,13 +13,11 @@ stages:
test:
stage: test
cache:
paths:
- node_modules/
image: registry.gitlab.com/dasch8/angular-ci:latest
script:
- npm install
- npm run lint
- npm test --progress false --watch=false --browsers=Chromium_CI
- yarn install
- yarn run lint
- yarn test --progress false --watch=false --browsers=Chromium_CI
build-web-assets:
stage: test
......@@ -27,7 +25,7 @@ build-web-assets:
paths:
- node_modules/
script:
- npm install
- npm ci
- node --max_old_space_size=6000 node_modules/@angular/cli/bin/ng build --prod --build-optimizer --progress false --source-map
artifacts:
paths:
......@@ -54,7 +52,7 @@ build-ext-assets:
build-push-docker:
stage: docker
image: registry.gitlab.com/passit/docker-compose
image: docker:stable
services:
- docker:dind
dependencies:
......@@ -71,7 +69,7 @@ build-push-docker:
deploy-staging:
stage: deploy
image: registry.gitlab.com/passit/docker-compose
image: docker:stable
services:
- docker:dind
only:
......@@ -88,7 +86,7 @@ deploy-staging:
deploy-prod:
stage: deploy
image: registry.gitlab.com/passit/docker-compose
image: docker:stable
services:
- docker:dind
only:
......
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