github: fix build on newer Alpine Linux for tests

gobwas · Dec 8, 2020 · e5bc048 · e5bc048
1 parent 1281ff4
commit e5bc048
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/autobahn/docker/autobahn/Dockerfile b/autobahn/docker/autobahn/Dockerfile
@@ -1,9 +1,9 @@
 FROM alpine:3.12
 
-RUN apk add --no-cache python python-dev gcc build-base musl-dev libffi-dev openssl-dev && \
+RUN apk add --no-cache python2 python2-dev gcc build-base musl-dev libffi-dev openssl-dev && \
 	python -m ensurepip && \
 	pip install --upgrade pip && \
-	pip install autobahntestsuite
+	pip install --no-python-version-warning autobahntestsuite
 
 VOLUME /config
 VOLUME /report

diff --git a/autobahn/docker/server/Dockerfile b/autobahn/docker/server/Dockerfile
@@ -1,10 +1,13 @@
 FROM golang:1.15.6-alpine3.12
 
-RUN	apk add --no-cache git && \
-	go get github.com/gobwas/httphead/... && \
-	go get github.com/gobwas/pool/... 
+WORKDIR /go/src/github.com/gobwas/ws
 
-COPY . /go/src/github.com/gobwas/ws
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
+
+COPY . .
+ENV CGO_ENABLED=0
 RUN go test -c -tags autobahn -coverpkg "github.com/gobwas/ws/..." github.com/gobwas/ws/example/autobahn
 
 CMD ["./autobahn.test", "-test.coverprofile", "/report/server.coverage"]