Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aad42dc authored by Romain Hunault's avatar Romain Hunault
Browse files

Try the last docker in docker

parent e4b92dc8

.gitlab-ci.yml

+8 −4
Original line number Original line Diff line number Diff line 
image: $CI_REGISTRY_IMAGE/env:latest

image: $CI_REGISTRY_IMAGE/env:latest





DOCKER_TLS_CERTDIR: "/certs"



stages:

stages:

 - check

 - check

 - build

 - build
@@ -24,18 +26,18 @@ build:web: 
    - ./manage.sh styles

    - ./manage.sh styles

    - ./manage.sh grunt_build

    - ./manage.sh grunt_build









.build:docker:

.build:docker:

  stage: build

  stage: build

  image: docker:git

  image: docker:git

  services:

  services:

    - docker:18-dind

    - docker:dind

  before_script:

  before_script:

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

  script:

    - docker build -t $CI_REGISTRY_IMAGE .

    - docker build -t $CI_REGISTRY_IMAGE .

    - docker push $CI_REGISTRY_IMAGE

    - docker push $CI_REGISTRY_IMAGE

  tags:

    - harold





build:docker:master:

build:docker:master:

  extends: .build:docker

  extends: .build:docker
@@ -65,7 +67,7 @@ test:functional: 
  stage: test

  stage: test

  image: docker:stable

  image: docker:stable

  services:

  services:

    - docker:18-dind

    - docker:dind

  variables:

  variables:

    DOCKER_HOST: tcp://docker:2375/

    DOCKER_HOST: tcp://docker:2375/

    DOCKER_DRIVER: overlay2

    DOCKER_DRIVER: overlay2
@@ -78,6 +80,8 @@ test:functional: 
    paths:

    paths:

      - coverage

      - coverage

    expire_in: 1 hour

    expire_in: 1 hour

  tags:

    - harold





coverage:

coverage:

  stage: report

  stage: report