From 6c27d817c2ace909e52667405b879c1243c34d1f Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 3 Aug 2017 19:17:04 +0200
Subject: [PATCH] use exisiting docker-compose image
---
.gitlab-ci.yml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80e711b..bb0be5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,6 @@ variables:
DOCKER_HOST: "$DEPLOYMENT_HOST"
DOCKER_TLS_VERIFY: "1"
DOCKER_CERT_PATH: "certs"
- DOCKER_COMPOSE_VERSION: 1.14.0
- PY_DOCKER_VERSION: 2.4.2
stages:
- deploy
@@ -17,10 +15,6 @@ review:
- develop
environment: review
before_script:
- - apk add --no-cache py-pip
- - pip install --upgrade pip
- - pip install docker-compose==$DOCKER_COMPOSE_VERSION
- - pip install -U docker==$PY_DOCKER_VERSION
- mkdir -p $DOCKER_CERT_PATH
- echo "$DEPLOYMENT_CACERT" > $DOCKER_CERT_PATH/ca.pem
- echo "$DEPLOYMENT_CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem
@@ -34,7 +28,7 @@ review:
- docker-compose up -d
after_script:
- docker-compose rm -f
- image: docker:17
+ image: docker/compose:1.14.0
tags:
- docker
--
GitLab