Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use image-tag from build-tools #1785

Merged
merged 3 commits into from
Aug 16, 2016
Merged

Use image-tag from build-tools #1785

merged 3 commits into from
Aug 16, 2016

Conversation

ekimekim
Copy link
Contributor

Update ./tools to latest build-tools master
and replace image-tag script with the newly-shared version

db5efc0 Merge pull request #28 from weaveworks/mike/add-image-tag
5312c40 Import image-tag script into build tools so it can be shared
7e850f8 Fix logs path
dda9785 Update deploy api
f2f4e5b Fix the wcloud client
3925eb6 Merge pull request #27 from weaveworks/wcloud-events
77355b9 Lint
d9a1c6c Add wcloud events, update flags and error nicely when there is no config

git-subtree-dir: tools
git-subtree-split: db5efc0
@@ -69,12 +69,12 @@ deployment:
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS &&
(test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" == "weaveworks" || (
docker tag weaveworks/scope:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:latest &&
docker tag weaveworks/scope:$(./image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag)
docker tag weaveworks/scope:$(./tools/image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag)

This comment was marked as abuse.

This comment was marked as abuse.

@tomwilkie
Copy link
Contributor

@ekimekim ping?

image-tag is now shared code from the build-tools repo
@ekimekim ekimekim force-pushed the mike/update-build-tools branch from 325124d to 1e15e43 Compare August 16, 2016 14:12
@ekimekim
Copy link
Contributor Author

fixed, ptal

@tomwilkie
Copy link
Contributor

LGTM

@tomwilkie tomwilkie merged commit 21cfc83 into master Aug 16, 2016
@tomwilkie tomwilkie deleted the mike/update-build-tools branch August 16, 2016 14:52
alepuccetti pushed a commit to kinvolk-archives/scope that referenced this pull request Aug 17, 2016
* Squashed 'tools/' changes from e9e7e6b..db5efc0

db5efc0 Merge pull request weaveworks#28 from weaveworks/mike/add-image-tag
5312c40 Import image-tag script into build tools so it can be shared
7e850f8 Fix logs path
dda9785 Update deploy api
f2f4e5b Fix the wcloud client
3925eb6 Merge pull request weaveworks#27 from weaveworks/wcloud-events
77355b9 Lint
d9a1c6c Add wcloud events, update flags and error nicely when there is no config

git-subtree-dir: tools
git-subtree-split: db5efc0

* Remove ./image-tag and use ./tools/image-tag instead

image-tag is now shared code from the build-tools repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants