Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378811 )
Change subject: docker: updated cache-buster cmd for operations-puppet
......................................................................
docker: updated cache-buster cmd for operations-puppet
Change-Id: Iebf99adcb48b3eea5622c72ece88681d47e11b32
---
M dockerfiles/operations-puppet/Dockerfile
M dockerfiles/operations-puppet/prebuild.sh
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/11/378811/1
diff --git a/dockerfiles/operations-puppet/Dockerfile
b/dockerfiles/operations-puppet/Dockerfile
index a9cc3f0..43b37df 100644
--- a/dockerfiles/operations-puppet/Dockerfile
+++ b/dockerfiles/operations-puppet/Dockerfile
@@ -19,7 +19,7 @@
pip install pip==8.1.2 && \
pip install tox==1.9.2 setuptools
-COPY .cache-buster /.cache-buster
+COPY .cache-buster-operations-puppet /.cache-buster-operations-puppet
# Make all kinds of artifacts
RUN mkdir -p /tmp/cache && \
diff --git a/dockerfiles/operations-puppet/prebuild.sh
b/dockerfiles/operations-puppet/prebuild.sh
index f7e837d..9d954e4 100755
--- a/dockerfiles/operations-puppet/prebuild.sh
+++ b/dockerfiles/operations-puppet/prebuild.sh
@@ -1,10 +1,9 @@
#!/bin/bash
-set -eu
-set -o pipefail
+set -e
# This is copied in Dockerfile to ensure that a build step grabs a fresh
# copy of the git repo when it is updated rather than using a layer from
# the local Docker cache.
-curl -s
https://gerrit.wikimedia.org/r/projects/operations%2Fpuppet/branches/production
| grep revision | xargs > .cache-buster
\ No newline at end of file
+git ls-remote https://gerrit.wikimedia.org/r/p/operation/puppet.git
refs/heads/production > .cache-buster-operations-puppet
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/378811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebf99adcb48b3eea5622c72ece88681d47e11b32
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
