|
@@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode
|
|
|
RUN cd /tmp && \
|
|
RUN cd /tmp && \
|
|
|
git clone https://github.com/google/protobuf.git && \
|
|
git clone https://github.com/google/protobuf.git && \
|
|
|
cd protobuf && \
|
|
cd protobuf && \
|
|
|
- git reset c2b3b3e04e7a023efe06f2107705b45428847800 && \
|
|
|
|
|
|
|
+ git reset --hard c2b3b3e04e7a023efe06f2107705b45428847800 && \
|
|
|
./autogen.sh && \
|
|
./autogen.sh && \
|
|
|
./configure && \
|
|
./configure && \
|
|
|
make -j4 && \
|
|
make -j4 && \
|
|
@@ -157,7 +157,7 @@ RUN cd /tmp && \
|
|
|
rm -rf protobuf && \
|
|
rm -rf protobuf && \
|
|
|
git clone https://github.com/google/protobuf.git && \
|
|
git clone https://github.com/google/protobuf.git && \
|
|
|
cd protobuf && \
|
|
cd protobuf && \
|
|
|
- git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \
|
|
|
|
|
|
|
+ git reset --hard 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \
|
|
|
cd php && \
|
|
cd php && \
|
|
|
ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \
|
|
ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \
|
|
|
ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \
|
|
ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \
|