Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Added Makefile flexibility to use in CI and dev builds #1019

Merged
merged 1 commit into from
Mar 10, 2017

Conversation

msterin
Copy link
Contributor

@msterin msterin commented Mar 10, 2017

  1. Made user (for dockerhub) and tag configurable to be used in CI
  2. changed env var to set debug in the plugin from DVV_... to VDVS_...
  3. improved makefile info reporting
  4. made default plugin tag to be constructed from git current tag

Contributes to #886
tested: manual runs and demo to @shuklanirdesh82 :-)

NOTE: Managed plugin are out of "experimental" in Docker 1.13, so it works on 1.13 or new versioning scheme (Docker '17.xx...')

//CC @shuklanirdesh82

Copy link
Contributor

@shuklanirdesh82 shuklanirdesh82 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! few nits.

plugin/Makefile Outdated
# use EXTRA_TAG for adding suffixes like "-CI" or "-RELEASE" (otional)
PLUGIN_TAG ?= $(GIT_TAG)$(EXTRA_TAG)

# plugin name - used as a base for ful plugin name and container for extracting rootfs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: "full" ... I guess

plugin/Makefile Outdated
docker plugin push $(PLUGIN_NAME):$(PLUGIN_TAG)
@echo Pushing $(PLUGIN_NAME):$(PLUGIN_TAG) to dockerhub.io...
@docker plugin push $(PLUGIN_NAME):$(PLUGIN_TAG) || \
echo 'Please make sure the plugin is build ("make clean plugin") and you have logged in to docker hub first ("docker login -u $(DOCKER_HUB_USER)")'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about following message?

the plugin is build => the plugin is built

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, both typos fixed

@msterin
Copy link
Contributor Author

msterin commented Mar 10, 2017

CI failing on the known issue VolumeDriver.Create: Internal issue: ret != 0 but errno is not set. Cancelling operation.

Merging

@msterin msterin merged commit 066a1f7 into master Mar 10, 2017
@msterin msterin deleted the managed_plugin_ci.msterin branch March 10, 2017 23:38
Copy link
Contributor

@shaominchen shaominchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.



push:
docker plugin push $(PLUGIN_NAME):$(PLUGIN_TAG)
@echo Pushing $(PLUGIN_NAME):$(PLUGIN_TAG) to dockerhub.io...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: remove one redundant space

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants