diff options
| author | Andrew Harvey <andrew@alantgeo.com.au> | 2021-05-16 17:58:09 +1000 |
|---|---|---|
| committer | Andrew Harvey <andrew@alantgeo.com.au> | 2021-05-16 17:58:09 +1000 |
| commit | 15420512428e5aa01d275ac35411f2c637b2a998 (patch) | |
| tree | 0eeb7913f5e9b33c3c75a05f90ab534dfa52e198 | |
| parent | cbd914de31f53cd3192806eb9e9dd66928713b56 (diff) | |
use docker images
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60c2549..10a847b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,15 +59,11 @@ docker conflate: prepare: stage: prepare + image: "registry.gitlab.com/alantgeo/vicmap2osm:prepare" cache: <<: *global_cache policy: push script: - - apt-get update && apt-get install -y curl gnupg gdal-bin unzip wget make - - curl -fsSL https://deb.nodesource.com/setup_12.x | bash - - - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list - - apt-get update && apt-get install -y yarn nodejs - yarn install - mkdir -p dist - make data/vicmap.geojson @@ -75,15 +71,11 @@ prepare: build: stage: build + image: "registry.gitlab.com/alantgeo/vicmap2osm:build" cache: <<: *global_cache policy: pull script: - - apt-get update && apt-get install -y curl gnupg make - - curl -fsSL https://deb.nodesource.com/setup_12.x | bash - - - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list - - apt-get update && apt-get install -y yarn nodejs - yarn install - yarn run test - mkdir -p dist data |