From b26b154c4a85b0c378c5e03a1de0655d7d9a3de7 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Mon, 20 Apr 2020 19:02:19 +0100 Subject: [PATCH] Fixup the docker setup. (#196) --- docker/Dockerfile | 3 ++- docker/docker-compose.1804.52.yaml | 37 ++++++++++++++++++++++++++++++ docker/docker-compose.1804.53.yaml | 36 +++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 docker/docker-compose.1804.52.yaml create mode 100644 docker/docker-compose.1804.53.yaml diff --git a/docker/Dockerfile b/docker/Dockerfile index ae82af7dfc..5fa5cfe4f4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml new file mode 100644 index 0000000000..7825118591 --- /dev/null +++ b/docker/docker-compose.1804.52.yaml @@ -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 diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.1804.53.yaml new file mode 100644 index 0000000000..72d1b686ee --- /dev/null +++ b/docker/docker-compose.1804.53.yaml @@ -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