Skip to content

Commit

Permalink
Add libnghttp2 depdendency to Docker image (#338) (#344)
Browse files Browse the repository at this point in the history
Advance swift-nio-http2 revision to include support for nghttp2
packaged with Ubuntu 16.04.
  • Loading branch information
glbrntt authored and MrMage committed Dec 20, 2018
1 parent 54659b8 commit c3a03f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PROTOC_VERSION=3.5.1

# Install a few needed packages that aren't in swiftdocker/swift
RUN apt-get -q update \
&& apt-get -q install -y unzip \
&& apt-get -q install -y unzip libnghttp2-dev \
&& rm -r /var/lib/apt/lists/*

# Install protoc
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var packageDependencies: [Package.Dependency] = [
.package(url: "https://github.com/apple/swift-nio-zlib-support.git", .upToNextMinor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMinor(from: "1.11.0")),
.package(url: "https://github.com/apple/swift-nio-nghttp2-support.git", .upToNextMinor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-nio-http2.git", .revision("38b8235868e1e6277c420b73ac5cfdfa66382a85"))
.package(url: "https://github.com/apple/swift-nio-http2.git", .revision("dd9339e6310ad8537a271f3ff60a4f3976ca8e4d"))
]

var cGRPCDependencies: [Target.Dependency] = []
Expand All @@ -32,7 +32,7 @@ var cGRPCDependencies: [Target.Dependency] = []
let isLinux = true
#else
let isLinux = false
#endif
#endif

// On Linux, Foundation links with openssl, so we'll need to use that instead of BoringSSL.
// See https://github.com/apple/swift-nio-ssl/issues/16#issuecomment-392705505 for details.
Expand Down

0 comments on commit c3a03f1

Please sign in to comment.