diff --git a/net/grpc/gateway/docker/ubuntu_14_04/Dockerfile b/net/grpc/gateway/docker/ubuntu_14_04/Dockerfile index 1e8752e..1cc5134 100644 --- a/net/grpc/gateway/docker/ubuntu_14_04/Dockerfile +++ b/net/grpc/gateway/docker/ubuntu_14_04/Dockerfile @@ -77,6 +77,8 @@ RUN add-apt-repository ppa:openjdk-r/ppa && \ COPY . /github/grpc-web RUN cd /github/grpc-web && \ + rm -rf third_party && \ + git checkout third_party && \ ./scripts/init_submodules.sh RUN cd /github/grpc-web/third_party/grpc && \ diff --git a/net/grpc/gateway/docker/ubuntu_16_04/Dockerfile b/net/grpc/gateway/docker/ubuntu_16_04/Dockerfile index ecf0666..595e39f 100644 --- a/net/grpc/gateway/docker/ubuntu_16_04/Dockerfile +++ b/net/grpc/gateway/docker/ubuntu_16_04/Dockerfile @@ -74,6 +74,8 @@ RUN apt-get update && apt-get install -y \ COPY . /github/grpc-web RUN cd /github/grpc-web && \ + rm -rf third_party && \ + git checkout third_party && \ ./scripts/init_submodules.sh RUN cd /github/grpc-web/third_party/grpc && \ diff --git a/scripts/darwin_x86_64.sh b/scripts/darwin_x86_64.sh index 7481849..3ff9792 100755 --- a/scripts/darwin_x86_64.sh +++ b/scripts/darwin_x86_64.sh @@ -1,3 +1,18 @@ +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + cd "$(dirname "$0")" ./init_submodules.sh cd .. diff --git a/scripts/debian_stretch.sh b/scripts/debian_stretch.sh index 112f95d..fcc4d6b 100755 --- a/scripts/debian_stretch.sh +++ b/scripts/debian_stretch.sh @@ -1,3 +1,18 @@ +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + cd "$(dirname "$0")" ./init_submodules.sh cd .. diff --git a/scripts/init_submodules.sh b/scripts/init_submodules.sh index fe4e770..9657eea 100755 --- a/scripts/init_submodules.sh +++ b/scripts/init_submodules.sh @@ -1,8 +1,20 @@ -cd "$(dirname "$0")" -cd .. +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cd "$(dirname "$0")"/.. git submodule update --init cd third_party/closure-library && git checkout tags/v20171112 -f && cd ../.. cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../.. cd third_party/grpc && git checkout 8224c45 -f && git submodule update --init && cd ../.. -cd scripts/ - diff --git a/scripts/ubuntu_12_04.sh b/scripts/ubuntu_12_04.sh index bf6ffbb..dc9cca8 100755 --- a/scripts/ubuntu_12_04.sh +++ b/scripts/ubuntu_12_04.sh @@ -1,3 +1,18 @@ +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + cd "$(dirname "$0")" ./init_submodules.sh cd .. diff --git a/scripts/ubuntu_14_04.sh b/scripts/ubuntu_14_04.sh index 45c4273..918b317 100755 --- a/scripts/ubuntu_14_04.sh +++ b/scripts/ubuntu_14_04.sh @@ -1,3 +1,18 @@ +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + cd "$(dirname "$0")" ./init_submodules.sh cd .. diff --git a/scripts/ubuntu_16_04.sh b/scripts/ubuntu_16_04.sh new file mode 100644 index 0000000..1816385 --- /dev/null +++ b/scripts/ubuntu_16_04.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cd "$(dirname "$0")" +./init_submodules.sh +cd .. +make clean +docker build -t ubuntu_16_04 -f net/grpc/gateway/docker/ubuntu_16_04/Dockerfile . +CONTAINER_ID=$(docker create ubuntu_16_04) +docker cp "$CONTAINER_ID:/github/grpc-web/gConnector.zip" net/grpc/gateway/docker/ubuntu_16_04 +docker cp "$CONTAINER_ID:/github/grpc-web/gConnector_static.zip" net/grpc/gateway/docker/ubuntu_16_04 +docker rm "$CONTAINER_ID"