Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
3ca44892
Commit
3ca44892
authored
9 years ago
by
Stanley Cheung
Browse files
Options
Downloads
Plain Diff
Merge pull request #4371 from jtattermusch/php_docker_flake
Try to prevent PHP interop flake
parents
467a02af
1c8c7ee7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/jenkins/grpc_interop_php/Dockerfile
+14
-0
14 additions, 0 deletions
tools/jenkins/grpc_interop_php/Dockerfile
tools/jenkins/grpc_interop_php/build_interop.sh
+1
-9
1 addition, 9 deletions
tools/jenkins/grpc_interop_php/build_interop.sh
with
15 additions
and
9 deletions
tools/jenkins/grpc_interop_php/Dockerfile
+
14
−
0
View file @
3ca44892
...
...
@@ -100,5 +100,19 @@ RUN /bin/bash -l -c "rvm all do gem install ronn rake"
RUN
curl
-sS
https://getcomposer.org/installer | php
RUN
mv
composer.phar /usr/local/bin/composer
# Download the patched PHP protobuf so that PHP gRPC clients can be generated
# from proto3 schemas.
RUN
git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
RUN
/bin/bash
-l
-c
"rvm use ruby-2.1
\
&& cd /var/local/git/protobuf-php
\
&& rvm all do rake pear:package version=1.0
\
&& pear install Protobuf-1.0.tgz"
# As an attempt to work around #4212, try to prefetch Protobuf-PHP dependency
# into composer cache to prevent "composer install" from cloning on each build.
RUN
git clone
--mirror
https://github.com/stanley-cheung/Protobuf-PHP.git
\
/root/.composer/cache/vcs/git-github.com-stanley-cheung-Protobuf-PHP.git/
# Define the default command.
CMD
["bash"]
This diff is collapsed.
Click to expand it.
tools/jenkins/grpc_interop_php/build_interop.sh
+
1
−
9
View file @
3ca44892
...
...
@@ -29,7 +29,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Builds PHP interop server and client in a base image.
set
-e
set
-e
x
mkdir
-p
/var/local/git
git clone
--recursive
/var/local/jenkins/grpc /var/local/git/grpc
...
...
@@ -45,18 +45,10 @@ make install-certs
# gRPC core and protobuf need to be installed
make
install
# Download the patched PHP protobuf so that PHP gRPC clients can be generated
# from proto3 schemas.
git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
(
cd
src/php/ext/grpc
&&
phpize
&&
./configure
&&
make
)
(
cd
third_party/protobuf
&&
make
install
)
(
cd
/var/local/git/protobuf-php
\
&&
rvm all
do
rake pear:package
version
=
1.0
\
&&
pear
install
Protobuf-1.0.tgz
)
(
cd
src/php
&&
composer
install
)
(
cd
src/php
&&
protoc-gen-php
-i
tests/interop/
-o
tests/interop/ tests/interop/test.proto
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment