Browse Source

Add libnghttp2 depdendency to Docker image (#338) (#344)

Advance swift-nio-http2 revision to include support for nghttp2
packaged with Ubuntu 16.04.
George Barnett 7 years ago
parent
commit
c3a03f1baf
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Docker/Dockerfile
  2. 2 2
      Package.swift

+ 1 - 1
Docker/Dockerfile

@@ -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

+ 2 - 2
Package.swift

@@ -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] = []
@@ -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.