Skip to content

Commit

Permalink
Use old docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome committed Jun 23, 2022
1 parent 9ec4b9a commit b31d382
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
5 changes: 0 additions & 5 deletions Dockerfile-test
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ RUN set -x \
wget \
libpcre3 libpcre3-dev \
zlib1g-dev
# gcc-8 \
# g++-8 \
# ### Use gcc-8 (the default gcc has this problem when using with address sanitizer:
# ### https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84428)
# && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8

### Build opentracing-cpp
RUN cd / \
Expand Down
4 changes: 4 additions & 0 deletions ci/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
set -x
set -e

# workaround to install docker-compose v1
sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose

docker version
docker-compose version

Expand Down
2 changes: 1 addition & 1 deletion test/environment/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3'
services:

nginx:
Expand Down
4 changes: 4 additions & 0 deletions test/environment/logs/debug.log
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@

2022/06/23 05:34:30 [debug] 7#0: epoll add event: fd:9 op:1 ev:00002001
2022/06/23 05:34:36 [debug] 7#0: epoll add event: fd:9 op:1 ev:00002001
2022/06/23 05:35:55 [debug] 8#0: epoll add event: fd:9 op:1 ev:00002001
2022/06/23 05:56:04 [debug] 7#0: epoll add event: fd:9 op:1 ev:00002001
1 change: 0 additions & 1 deletion test/environment/logs/error.log

This file was deleted.

1 change: 1 addition & 0 deletions test/environment/traces/nginx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
4 changes: 2 additions & 2 deletions test/nginx_opentracing_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def setUp(self):
)

self.environment_handle = subprocess.Popen(
["docker-compose", "up", "--no-color"],
["docker-compose", "up"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
Expand All @@ -55,7 +55,7 @@ def setUp(self):

# Wait so that backend can come up.
# TODO: replace with something better
time.sleep(2)
time.sleep(5)

self.conn = http.client.HTTPConnection("localhost", 8080, timeout=5)
self.grpcConn = grpc.insecure_channel("localhost:8081")
Expand Down

0 comments on commit b31d382

Please sign in to comment.