From b70d04eb0bf7a7ce79ed60dea4bc1c8deffbffc4 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 25 Jun 2017 16:45:33 +0200
Subject: [PATCH] Should now build / publish front assets with runner
---
.gitlab-ci.yml | 23 +++++++++++++++++++++++
dev.yml | 18 +++++++++---------
2 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6341011..836600d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,28 @@
image: docker:latest
+steps:
+ - test
+ - build
+
+test_api:
+ stage: test
+ script:
+ - ./api/runtests
+
+ tags:
+ - dind
+
+build_front:
+ stage: build
+ script:
+ - docker-compose -f dev.yml front rm dist/*
+ - docker-compose -f dev.yml front npm run build
+ artifacts:
+ paths:
+ - front/dist
+
+ tags:
+ - dind
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
# variables:
diff --git a/dev.yml b/dev.yml
index 2144d4b1..526ce1ba 100644
--- a/dev.yml
+++ b/dev.yml
@@ -52,12 +52,12 @@ services:
- redis
- celeryworker
- nginx:
- env_file: .env.dev
- build: ./api/compose/nginx
- links:
- - api
- volumes:
- - ./api/funkwhale_api/media:/staticfiles/media
- ports:
- - "0.0.0.0:6001:80"
+ # nginx:
+ # env_file: .env.dev
+ # build: ./api/compose/nginx
+ # links:
+ # - api
+ # volumes:
+ # - ./api/funkwhale_api/media:/staticfiles/media
+ # ports:
+ # - "0.0.0.0:6001:80"
--
GitLab