Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397818 )
Change subject: docker: fix typo in operations-puppet
......................................................................
docker: fix typo in operations-puppet
Change-Id: I02b8d83b21aa4abcbcd23485ce53cf7959ca9a30
---
M dockerfiles/operations-puppet/Dockerfile.template
M dockerfiles/operations-puppet/changelog
M dockerfiles/operations-puppet/example-run.sh
M jjb/operations-puppet.yaml
4 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/18/397818/1
diff --git a/dockerfiles/operations-puppet/Dockerfile.template
b/dockerfiles/operations-puppet/Dockerfile.template
index 160b2f6..d26ad0b 100644
--- a/dockerfiles/operations-puppet/Dockerfile.template
+++ b/dockerfiles/operations-puppet/Dockerfile.template
@@ -17,7 +17,7 @@
&& cd "${PUPPET_DIR}" \
&& git tag -f 'docker-head' && git gc --prune=now \
&& TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v --notest \
- && bundle install --clean --path="${PUPPET_DIR}/.bundle" \
+ && bundle install --clean --path="${PUPPET_DIR}/.bundle"
WORKDIR /srv/workspace
ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/operations-puppet/changelog
b/dockerfiles/operations-puppet/changelog
index 51743d9..60cf2a0 100644
--- a/dockerfiles/operations-puppet/changelog
+++ b/dockerfiles/operations-puppet/changelog
@@ -1,3 +1,11 @@
+operations-puppet (0.2.1) UNRELEASED; urgency=medium
+
+ * Fix trailing \ in command causing:
+ ERROR:
+ "bundle install" was called with arguments ["WORKDIR", "/srv/workspace"]
+
+ -- Antoine Musso <[email protected]> Tue, 12 Dec 2017 15:21:03 +0100
+
operations-puppet (0.2.0) wikimedia; urgency=medium
* Switch to user nobody earlier before cloning puppet.git and populating the
diff --git a/dockerfiles/operations-puppet/example-run.sh
b/dockerfiles/operations-puppet/example-run.sh
index 4cf674f..d851666 100644
--- a/dockerfiles/operations-puppet/example-run.sh
+++ b/dockerfiles/operations-puppet/example-run.sh
@@ -8,4 +8,4 @@
--env ZUUL_COMMIT=72d31ffb0fa612482d268b6f5484785842cd0fda \
--env ZUUL_REF=refs/changes/49/374349/2 \
--volume /$(pwd)/log://srv/workspace/log \
- docker-registry.wikimedia.org/releng/operations-puppet:0.2.0
+ docker-registry.wikimedia.org/releng/operations-puppet:0.2.1
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index ada36da..c622796 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -53,7 +53,7 @@
builders:
- docker-log-dir
- docker-run-with-log:
- image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.2.0'
+ image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.2.1'
logdir: '/srv/workspace/log'
wrappers:
- timeout:
--
To view, visit https://gerrit.wikimedia.org/r/397818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b8d83b21aa4abcbcd23485ce53cf7959ca9a30
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
