Commit 7a59363c authored by Stewart Williams's avatar Stewart Williams
Browse files

Merge branch 'master' into ST3_containerise_Python_device

# Conflicts:
#	.gitlab-ci.yml
parents 70ea547b a56784d4
Loading
Loading
Loading
Loading
+13 −10
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ image:
  name: registry.gitlab.com/ska-telescope/ska-docker/tango-builder:latest

variables:
  DOCKER_HOST: tcp://docker:2375
  DOCKER_DRIVER: overlay

services:
@@ -31,10 +30,14 @@ stages:
  - test

build:
  tags:
    - docker-executor
  script:
    - make build

test:
  tags:
    - docker-executor
  script:
    - make test
    - mv build public