diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-03-31 14:04:29 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-03-31 14:04:29 -0700 |
| commit | 32ad5a3e0d1a38440945a759a0dcb6245ac836d8 (patch) | |
| tree | 13587e52c1444aa2efe5c16b1ba1a78e4e7e3572 /jenkins | |
| parent | b7c813fb67706c683f14b808679c9657b29c5a6e (diff) | |
Use "git reset --hard" to actually reset the code.
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index d75d4cef..685c05d6 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ - git reset c2b3b3e04e7a023efe06f2107705b45428847800 && \ + git reset --hard c2b3b3e04e7a023efe06f2107705b45428847800 && \ ./autogen.sh && \ ./configure && \ make -j4 && \ @@ -157,7 +157,7 @@ RUN cd /tmp && \ rm -rf protobuf && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ - git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ + git reset --hard 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ cd 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 && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 02e9df17..2d83735d 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ + git reset --hard 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ |