From cbb193f8acbbf2f5071a8edb78c80edadeaf6f87 Mon Sep 17 00:00:00 2001
From: janmax <j.michal@stud.uni-goettingen.de>
Date: Fri, 18 May 2018 20:03:40 +0200
Subject: [PATCH] Fixes staging
---
.gitlab-ci.yml | 4 +---
docker-compose.yml | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 465c8782..63ec20ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,11 +103,9 @@ pages:
# ============================== Staging section ============================= #
.staging_template: &staging_definition
stage: staging
- image: docker:latest
+ image: docker/compose
only:
- master
- before_script:
- - apk add --update py-pip && pip install docker-compose
staging:
<<: *staging_definition
diff --git a/docker-compose.yml b/docker-compose.yml
index 94f997ad..24f35a35 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,8 @@ services:
grady:
image: docker.gitlab.gwdg.de/j.michal/grady:master
command: >
- bash -c "./manage.py maketestdata &&
- ./deploy.sh"
+ sh -c "./manage.py maketestdata &&
+ ./deploy.sh"
depends_on:
- postgres
restart: always
--
GitLab