Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
45d03a97
Unverified
Commit
45d03a97
authored
Aug 23, 2018
by
Feng Xiao
Committed by
GitHub
Aug 23, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5074 from xfxyjwf/links
Revert changed links in Dockerfiles.
parents
fd4baa91
a0a17e24
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Dockerfile
kokoro/linux/32-bit/Dockerfile
+1
-1
Dockerfile
kokoro/linux/64-bit/Dockerfile
+2
-2
tests.sh
tests.sh
+1
-1
No files found.
kokoro/linux/32-bit/Dockerfile
View file @
45d03a97
...
...
@@ -96,7 +96,7 @@ RUN php -r "unlink('composer-setup.php');"
RUN
composer config
-g
--
disable-tls
true
RUN
composer config
-g
--
secure-http
false
RUN
cd
/tmp
&&
\
git clone https://github.com/
protocolbuffers
/protobuf.git
&&
\
git clone https://github.com/
google
/protobuf.git
&&
\
cd
protobuf/php
&&
\
git reset
--hard
49b44bff2b6257a119f9c6a342d6151c736586b8
&&
\
ln
-sfn
/usr/local/php-5.5/bin/php /usr/bin/php
&&
\
...
...
kokoro/linux/64-bit/Dockerfile
View file @
45d03a97
...
...
@@ -127,7 +127,7 @@ ENV MAVEN_REPO /var/maven_local_repository
ENV
MVN mvn --batch-mode
RUN
cd
/tmp
&&
\
git clone https://github.com/
protocolbuffers
/protobuf.git
&&
\
git clone https://github.com/
google
/protobuf.git
&&
\
cd
protobuf
&&
\
git reset
--hard
129a6e2aca95dcfb6c3e717d7b9cca1f104fde39
&&
\
./autogen.sh
&&
\
...
...
@@ -180,7 +180,7 @@ RUN composer config -g -- disable-tls true
RUN
composer config
-g
--
secure-http
false
RUN
cd
/tmp
&&
\
rm
-rf
protobuf
&&
\
git clone https://github.com/
protocolbuffers
/protobuf.git
&&
\
git clone https://github.com/
google
/protobuf.git
&&
\
cd
protobuf
&&
\
git reset
--hard
49b44bff2b6257a119f9c6a342d6151c736586b8
&&
\
cd
php
&&
\
...
...
tests.sh
View file @
45d03a97
...
...
@@ -105,7 +105,7 @@ build_golang() {
export
PATH
=
"
`
pwd
`
/src:
$PATH
"
export
GOPATH
=
"
$HOME
/gocode"
mkdir
-p
"
$GOPATH
/src/github.com/
google
"
mkdir
-p
"
$GOPATH
/src/github.com/
protocolbuffers
"
rm
-f
"
$GOPATH
/src/github.com/protocolbuffers/protobuf"
ln
-s
"
`
pwd
`
"
"
$GOPATH
/src/github.com/protocolbuffers/protobuf"
export
PATH
=
"
$GOPATH
/bin:
$PATH
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment