Skip to content

Commit 72d1a94

Browse files
author
Gregory Hill
committed
fix ci integration tests
Signed-off-by: Gregory Hill <[email protected]>
1 parent 76e567c commit 72d1a94

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

.circleci/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
FROM golang:1.11-alpine
22

33
ENV PROTO_VERSION 3.3.0
4-
ENV DCOMP_VERSION 1.23.2
54

6-
RUN apk add --update --no-cache nodejs npm make curl unzip git python bash gcc docker build-base
5+
RUN apk add --update --no-cache nodejs npm make curl unzip git python3 bash gcc docker build-base jq
76

8-
RUN curl -L "https://github.com/docker/compose/releases/download/${DCOMP_VERSION}/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose
7+
RUN pip3 install docker-compose
98
RUN curl -OL https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_64.zip
109
RUN unzip protoc-${PROTO_VERSION}-linux-x86_64.zip -d protobuf
1110
RUN cp protobuf/bin/protoc /usr/bin/protoc
@@ -18,7 +17,7 @@ RUN go get -u github.com/golang/dep/cmd/dep
1817
# install aws auth binaries
1918
RUN curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
2019
RUN unzip awscli-bundle.zip
21-
RUN ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
20+
RUN python3 ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
2221

2322
# install gcloud auth binaries
2423
RUN curl https://sdk.cloud.google.com | bash

scripts/integration/test_ipfs.sh

-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
# - Docker compose
55
# - jq
66

7-
if [[ "$(which ipfs)" == "" ]]
8-
then
9-
echo "Integration test requires IPFS"
10-
exit 1
11-
fi
12-
137
# Integration test dir
148
cd "$(dirname "$0")"
159

0 commit comments

Comments
 (0)