grpc
/
grpc-web
mirror of https://github.com/grpc/grpc-web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #203 from stanley-cheung/master 

Minor edits
This commit is contained in:
Stanley Cheung 2018-07-11 14:36:23 -07:00 committed by GitHub
parent b55f572c42 b1e4098716
commit 9f5cb2f7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,7 +10,7 @@ GRPC_INC := $(ROOT_DIR)/third_party/grpc/include
GRPC_SRC := $(ROOT_DIR)/third_party/grpc
GRPC_LIB := $(ROOT_DIR)/third_party/grpc/libs/opt
all: clean package package_static
all: clean package_static
protos:
cd "$(ROOT_DIR)" && LD_LIBRARY_PATH="$(PROTO_LIB):$(GRPC_LIB)" "$(PROTOC)" \

4
net/grpc/gateway/docker/prereqs/Dockerfile
View File

@ -16,8 +16,6 @@ FROM ubuntu:16.04
ARG MAKEFLAGS=-j8
COPY . /github/grpc-web
RUN apt-get update && apt-get install -y \
autoconf \
automake \
@ -32,6 +30,8 @@ RUN apt-get update && apt-get install -y \
nginx \
zip
RUN git clone https://github.com/grpc/grpc-web /github/grpc-web
RUN cd /github/grpc-web && \
./scripts/init_submodules.sh

2
net/grpc/gateway/docker/static_assets/Dockerfile
View File

@ -14,7 +14,7 @@
FROM grpc-web:prereqs
COPY net/grpc/gateway/examples/echo/nginx_simple.conf \
RUN cp /github/grpc-web/net/grpc/gateway/examples/echo/nginx_simple.conf \
/etc/nginx/nginx.conf
RUN cd /github/grpc-web && \

2
net/grpc/gateway/docker/ubuntu_12_04/Dockerfile
View File

@ -39,7 +39,7 @@ RUN update-alternatives \
RUN update-alternatives \
--install /usr/bin/gcc gcc /usr/bin/gcc-4.6 40 \
--slave /usr/bin/g++ g++ /usr/bin/g++-4.6
COPY . /github/grpc-web
RUN git clone https://github.com/grpc/grpc-web /github/grpc-web
RUN cd /github/grpc-web/third_party/grpc && \
make
RUN cd /github/grpc-web && \