From 2d740e0881de189695c946ef9a07c72e6ca016cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstro=CC=88m?= <erik@hedenstroem.com>
Date: Tue, 14 Jun 2016 22:01:01 +0200
Subject: [PATCH] Added sleep to let socat settle. Fixed feature test.
---
.gitlab-ci.yml | 8 ++------
features/consul_proxy.feature | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca1d886..35240e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,9 @@ before_script:
- export GOPATH=${CI_PROJECT_DIR}/_build/go
- export PATH=${ERL_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:$PATH
- mkdir -p ${GOPATH}
- - whoami
- - socat -d -d -d -lf /var/log/socat.log tcp-listen:2375,reuseaddr,bind=127.0.0.1,fork unix-connect:/var/run/docker.sock &
+ - socat /var/log/socat.log tcp-listen:2375,reuseaddr,bind=127.0.0.1,fork unix-connect:/var/run/docker.sock &
+ - sleep 3
- export DOCKER_HOST="tcp://127.0.0.1:2375"
- - ps -ax
- - ls -l /var/run/
- - sleep 300
- - curl -v 127.0.0.1:2375
- docker info
- rebar3 update
diff --git a/features/consul_proxy.feature b/features/consul_proxy.feature
index e1683e7..e5f5ddc 100644
--- a/features/consul_proxy.feature
+++ b/features/consul_proxy.feature
@@ -4,7 +4,7 @@ Feature: Proxy functionality
route requests to services
Background:
- Given a docker container named consul running ehedenst/consul:$<CI_BUILD_ARCH> with commands:
+ Given a docker container named consul running hedenstroem/consul with commands:
"""
agent -dev -ui-dir /ui -client 0.0.0.0
"""
--
GitLab