Unverified Commit 45d03a97 authored by Feng Xiao's avatar Feng Xiao Committed by GitHub

Merge pull request #5074 from xfxyjwf/links

Revert changed links in Dockerfiles.
parents fd4baa91 a0a17e24
......@@ -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 && \
......
......@@ -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 && \
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment