mirror of
https://github.com/HoneyryderChuck/httpx.git
synced 2025-12-09 00:01:48 -05:00
changed the way that the tests run, by running on top of a native ruby image, which allows other docker-compose files to overwrite the setting
This commit is contained in:
parent
af15faeb19
commit
41b5c53fb2
4
docker-compose-2.1.yml
Normal file
4
docker-compose-2.1.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: ruby:2.1-alpine
|
||||||
4
docker-compose-2.2.yml
Normal file
4
docker-compose-2.2.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: ruby:2.2-alpine
|
||||||
4
docker-compose-2.3.yml
Normal file
4
docker-compose-2.3.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: ruby:2.3-alpine
|
||||||
4
docker-compose-2.4.yml
Normal file
4
docker-compose-2.4.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: ruby:2.4-alpine
|
||||||
4
docker-compose-2.5.yml
Normal file
4
docker-compose-2.5.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: ruby:2.5-alpine
|
||||||
4
docker-compose-jruby-9.0.0.0.yml
Normal file
4
docker-compose-jruby-9.0.0.0.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
httpx:
|
||||||
|
image: jruby:9.1.15-alpine
|
||||||
@ -2,29 +2,26 @@ version: '3'
|
|||||||
services:
|
services:
|
||||||
httpx:
|
httpx:
|
||||||
environment:
|
environment:
|
||||||
- SSL_CERT_FILE=/httpx/test/support/ci/certs/ca-bundle.crt
|
- SSL_CERT_FILE=/home/test/support/ci/certs/ca-bundle.crt
|
||||||
- HTTPBIN_HOST=nghttp2
|
- HTTPBIN_HOST=nghttp2
|
||||||
- HTTPX_HTTP_PROXY=http://http_proxy:3128
|
- HTTPX_HTTP_PROXY=http://httpproxy:3128
|
||||||
- HTTPX_HTTPS_PROXY=http://http_proxy:3128
|
- HTTPX_HTTPS_PROXY=http://httpproxy:3128
|
||||||
- HTTPX_SOCKS4_PROXY=socks4://socks_proxy:8080
|
- HTTPX_SOCKS4_PROXY=socks4://socksproxy:8080
|
||||||
- HTTPX_SOCKS4A_PROXY=socks4a://socks_proxy:8080
|
- HTTPX_SOCKS4A_PROXY=socks4a://socksproxy:8080
|
||||||
- HTTPX_SOCKS5_PROXY=socks5://socks_proxy:8080
|
- HTTPX_SOCKS5_PROXY=socks5://socksproxy:8080
|
||||||
- PARALLEL=1
|
- PARALLEL=1
|
||||||
- CI=1
|
- CI=1
|
||||||
build:
|
image: ruby:2.4-alpine
|
||||||
context: .
|
|
||||||
dockerfile: test/support/ci/Dockerfile
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- http_proxy
|
- httpproxy
|
||||||
- socks_proxy
|
- socksproxy
|
||||||
- nghttp2
|
- nghttp2
|
||||||
volumes:
|
volumes:
|
||||||
- ./lib:/httpx/lib
|
- ./:/home
|
||||||
- ./test:/httpx/test
|
entrypoint:
|
||||||
command:
|
/home/test/support/ci/build.sh
|
||||||
"rake test:ci"
|
|
||||||
|
|
||||||
socks_proxy:
|
socksproxy:
|
||||||
image: qautomatron/docker-3proxy
|
image: qautomatron/docker-3proxy
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
@ -32,7 +29,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./test/support/ci:/etc/3proxy
|
- ./test/support/ci:/etc/3proxy
|
||||||
|
|
||||||
http_proxy:
|
httpproxy:
|
||||||
image: sameersbn/squid:3.3.8-23
|
image: sameersbn/squid:3.3.8-23
|
||||||
ports:
|
ports:
|
||||||
- "3128:3128"
|
- "3128:3128"
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
FROM ruby:2.4-alpine
|
|
||||||
|
|
||||||
RUN apk update && apk upgrade && \
|
|
||||||
apk add --no-cache g++ make git bash
|
|
||||||
|
|
||||||
RUN mkdir -p /httpx/lib/httpx
|
|
||||||
WORKDIR /httpx
|
|
||||||
|
|
||||||
COPY Gemfile Gemfile
|
|
||||||
COPY httpx.gemspec httpx.gemspec
|
|
||||||
COPY lib/httpx/version.rb lib/httpx/version.rb
|
|
||||||
|
|
||||||
RUN bundle install
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
ENTRYPOINT ["bundle", "exec"]
|
|
||||||
6
test/support/ci/build.sh
Executable file
6
test/support/ci/build.sh
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
apk update && apk upgrade
|
||||||
|
apk add --no-cache g++ make git bash
|
||||||
|
cd /home && rm Gemfile.lock && bundle install && bundle exec rake test:ci
|
||||||
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user