From e9ffe09b8b1522a0ef6cde948c1cb92f78d12e61 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <ajbeamon@apple.com>
Date: Mon, 14 Jan 2019 10:55:28 -0800
Subject: [PATCH 1/2] Go bindings reported the wrong required version when
 loading an incompatible version of fdb_c.

---
 bindings/go/src/fdb/fdb.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bindings/go/src/fdb/fdb.go b/bindings/go/src/fdb/fdb.go
index 76cf5ac67e..54992f902a 100644
--- a/bindings/go/src/fdb/fdb.go
+++ b/bindings/go/src/fdb/fdb.go
@@ -138,7 +138,7 @@ func APIVersion(version int) error {
 			if e == 2203 {
 				maxSupportedVersion := C.fdb_get_max_api_version()
 				if headerVersion > int(maxSupportedVersion) {
-					return fmt.Errorf("This version of the FoundationDB Go binding is not supported by the installed FoundationDB C library. The binding requires a library that supports API version %d, but the installed library supports a maximum version of %d.", version, maxSupportedVersion)
+					return fmt.Errorf("This version of the FoundationDB Go binding is not supported by the installed FoundationDB C library. The binding requires a library that supports API version %d, but the installed library supports a maximum version of %d.", headerVersion, maxSupportedVersion)
 				}
 				return fmt.Errorf("API version %d is not supported by the installed FoundationDB C library.", version)
 			}

From 842872e3de74cd807cf4715fc8ce55c28ba4dc71 Mon Sep 17 00:00:00 2001
From: Alvin Moore <alvinm@apple.com>
Date: Fri, 1 Feb 2019 07:08:03 -0800
Subject: [PATCH 2/2] Added build services within docker compose

---
 build/docker-compose.yaml | 43 +++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml
index 550c358522..987b8f1eeb 100644
--- a/build/docker-compose.yaml
+++ b/build/docker-compose.yaml
@@ -13,25 +13,46 @@ services:
     volumes:
       - ..:/foundationdb
     working_dir: /foundationdb
+    environment:
+      - MAKEJOBS=1
+
+  release-setup: &release-setup
+    <<: *build-setup
+    environment:
+      - MAKEJOBS=1
+      - RELEASE=true
+
+  snapshot-setup: &snapshot-setup
+    <<: *build-setup
 
   build-docs:
     <<: *build-setup
-    command: make docpackage
+    command: bash -c 'make -j "$${MAKEJOBS}" docpackage'
 
-  build-release: &build-release
+
+  release-packages: &release-packages
+    <<: *release-setup
+    command: bash -c 'make -j "$${MAKEJOBS}" packages'
+
+  snapshot-packages: &snapshot-packages
     <<: *build-setup
-    environment:
-      - RELEASE=true
-    command: make packages
+    command: bash -c 'make -j "$${MAKEJOBS}" packages'
 
-  build-snapshot: &build-snapshot
+  prb-packages:
+    <<: *snapshot-packages
+
+
+  release-bindings: &release-bindings
+    <<: *release-setup
+    command: bash -c 'make -j "$${MAKEJOBS}" bindings'
+
+  snapshot-bindings: &snapshot-bindings
     <<: *build-setup
-    environment:
-      - RELEASE=false
-    command: make packages
+    command: bash -c 'make -j "$${MAKEJOBS}" bindings'
+
+  prb-bindings:
+    <<: *snapshot-bindings
 
-  build-prb:
-    <<: *build-snapshot
 
   shell:
     <<: *build-setup