Переглянути джерело

Update Docker instructions to download a pre-built protoc.

Tim Burks 9 роки тому
батько
коміт
7a8dbb0371
1 змінених файлів з 5 додано та 11 видалено
  1. 5 11
      DOCKER.md

+ 5 - 11
DOCKER.md

@@ -25,7 +25,7 @@ Start a docker instance with the swiftdocker image:
     # update package list
     # update package list
     apt-get update
     apt-get update
     # install a few missing pieces
     # install a few missing pieces
-    apt-get install libz-dev
+    apt-get install libz-dev unzip
 
 
 ## Configure git (optional)
 ## Configure git (optional)
 
 
@@ -60,21 +60,15 @@ Start a docker instance with the swiftdocker image:
 	
 	
 ## Test the Swift gRPC plugin
 ## Test the Swift gRPC plugin
 
 
-    # install protoc build dependencies
-    apt-get install autoconf automake libtool curl make g++ unzip
-    # build and install protoc
+    # install protoc
     cd
     cd
-    git clone https://github.com/google/protobuf.git
-    cd protobuf
-    autogen.sh
-    ./configure
-    make install
+    curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
+    unzip protoc-3.2.0rc2-linux-x86_64.zip -d /usr
     # build the Swift gRPC plugin
     # build the Swift gRPC plugin
     cd
     cd
     cd grpc-swift/Plugin
     cd grpc-swift/Plugin
     make
     make
-    # set envirinment variables to allow protoc and the plugin to run 
-    export LD_LIBRARY_PATH=/usr/local/lib
+    # set environment variables to allow protoc and the plugin to run 
     export PATH=.:$PATH
     export PATH=.:$PATH
     # test the plugin by regenerating code for a sample .proto service
     # test the plugin by regenerating code for a sample .proto service
     make test
     make test