diff options
| author |  Gareth Coles <[email protected]> | 2018-06-13 13:23:06 +0100 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2018-06-13 13:23:06 +0100 |
| commit | 0d4d65fdf5e221063b71d640f72518808da88e3b (patch) | |
| tree | 69645a8c60931dba81687faf934f1781bb6497c7 | |
| parent | Build CI container on the CI (diff) | |
[CI] Use a container that has git
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | docker/ci.Dockerfile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69625120..2ea2b632 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: before_script: - docker info - image: docker:stable + image: docker:stable-git only: - master diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile index 0ea9ff9a..a744b84f 100644 --- a/docker/ci.Dockerfile +++ b/docker/ci.Dockerfile @@ -1,5 +1,6 @@ FROM python:3.6-alpine3.7 +# Install base packages RUN apk add --update autoconf automake \ build-base \ cmake curl \ @@ -10,11 +11,13 @@ RUN apk add --update autoconf automake \ ruby ruby-dev ruby-irb ruby-rdoc \ tini +# Set up env vars ENV PIPENV_VENV_IN_PROJECT=1 ENV PIPENV_IGNORE_VIRTUALENVS=1 ENV PIPENV_NOSPIN=1 ENV PIPENV_HIDE_EMOJIS=1 +# Install toolchain RUN pip install pipenv RUN gem install scss_lint RUN npm install -g eslint --save-dev |