Skip to content

Commit

Permalink
Fixup the docker setup. (apple#196)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukasa authored Apr 20, 2020
1 parent 82eb3fa commit b26b154
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 1 deletion.
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG swift_version=5.0
ARG ubuntu_version=bionic
FROM swift:$swift_version-$ubuntu_version
ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image
# needed to do again after FROM due to docker limitation
ARG swift_version
ARG ubuntu_version
Expand Down
37 changes: 37 additions & 0 deletions docker/docker-compose.1804.52.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: "3"

services:

runtime-setup:
image: swift-nio-http2:18.04-5.2
build:
args:
ubuntu_version: "bionic"
swift_version: "5.2"
h2spec_version: "2.2.1"

unit-tests:
image: swift-nio-http2:18.04-5.2

integration-tests:
image: swift-nio-http2:18.04-5.2
environment:
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=72010
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
- MAX_ALLOCS_ALLOWED_client_server_request_response=384810

performance-test:
image: swift-nio-http2:18.04-5.2

h2spec:
image: swift-nio-http2:18.04-5.2

test:
image: swift-nio-http2:18.04-5.2
environment:
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=72010
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
- MAX_ALLOCS_ALLOWED_client_server_request_response=384810

shell:
image: swift-nio-http2:18.04-5.2
36 changes: 36 additions & 0 deletions docker/docker-compose.1804.53.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: "3"

services:

runtime-setup:
image: swift-nio-http2:18.04-5.3
build:
args:
base_image: "swiftlang/swift:nightly-master-bionic"
h2spec_version: "2.2.1"

unit-tests:
image: swift-nio-http2:18.04-5.3

integration-tests:
image: swift-nio-http2:18.04-5.3
environment:
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=72010
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
- MAX_ALLOCS_ALLOWED_client_server_request_response=384810

performance-test:
image: swift-nio-http2:18.04-5.3

h2spec:
image: swift-nio-http2:18.04-5.3

test:
image: swift-nio-http2:18.04-5.3
environment:
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=72010
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
- MAX_ALLOCS_ALLOWED_client_server_request_response=384810

shell:
image: swift-nio-http2:18.04-5.3

0 comments on commit b26b154

Please sign in to comment.