docker-save support #687

Katsuya-Tomioka · 2017-01-08T14:40:30Z

I wrote to specify which one (and where) to save rather than go over build configs as in 'source'. Also not sure about where to autopull. Seemed too much in this context. Let me know.

codecov-io · 2017-01-08T14:43:54Z

Codecov Report

Merging #687 into master will increase coverage by 0.03%.
The diff coverage is 40%.

@@             Coverage Diff              @@
##             master     #687      +/-   ##
============================================
+ Coverage     47.48%   47.52%   +0.03%     
- Complexity     1002     1023      +21     
============================================
  Files           125      126       +1     
  Lines          6596     6694      +98     
  Branches        847      870      +23     
============================================
+ Hits           3132     3181      +49     
- Misses         3196     3241      +45     
- Partials        268      272       +4

Impacted Files	Coverage Δ	Complexity Δ
...8/maven/docker/assembly/DockerAssemblyManager.java	`14.14% <ø> (ø)`	`6 <0> (ø)`	⬇️
.../main/java/io/fabric8/maven/docker/SourceMojo.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...c/main/java/io/fabric8/maven/docker/StartMojo.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...ic8/maven/docker/access/DockerAccessException.java	`36.36% <0%> (-13.64%)`	`2 <0> (ø)`
...va/io/fabric8/maven/docker/AbstractDockerMojo.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...rc/main/java/io/fabric8/maven/docker/SaveMojo.java	`0% <0%> (ø)`	`0 <0> (?)`
...ric8/maven/docker/config/BuildImageSelectMode.java	`0% <0%> (ø)`	`0 <0> (?)`
...8/maven/docker/config/BuildImageConfiguration.java	`81.81% <100%> (+3.24%)`	`45 <0> (+1)`	⬆️
...n/java/io/fabric8/maven/docker/util/ImageName.java	`91.35% <100%> (-0.11%)`	`34 <0> (ø)`
...abric8/maven/docker/config/ImageConfiguration.java	`44.92% <100%> (ø)`	`11 <2> (ø)`	⬇️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6d2cbe...fbf2fd0. Read the comment docs.

rhuss · 2017-01-23T16:14:38Z

Thanks for the PR and sorry for the delay ! I hope I will have a chance to look at it soon.

rhuss · 2017-02-09T21:54:30Z

Sorry again for the delay, but should be added soon ;-)

Your PR looks good, I tuned it a bit. Especially its allowed now to run mvn docker:save with the need to provide any additional arguments as the plugin select some sane defaults:

If no name or alias is given, then the configuration is examined if there is only a single image with a build configuration. If this is the case, this image's name is used.
If no file is given, then the filename is calculated based on the alias or name. Currently the alias has prio, but maybe its better to use always the name. wdyt ?

What is still missing is documentation. As soon as we have this, we can merge it. When you feel fancy, feel free to submit some documentation. But I can update it, too.

Also some extra unit tests would be awesome (e.g. for ArchiveCompression which already was there but which I enhanced to cover the use cases introduced by SaveMojo).

* Allow an no-argument call to docker:save by chosing sane defaults * Reused ArchiveCompression for selecting the compression mode and a bit more

Katsuya-Tomioka · 2017-03-07T00:46:08Z

I'd probably prefer name over alias as default. $name-$alias.tar.gz if alias is available?

PR merged! Thanks!

rhuss · 2017-03-15T08:27:01Z

Thanks a lot, I will have a look at the weekend and will integrate the PR.

Signed-off-by: Stas Sukhanov <stas.sukhanov@gmail.com>

PR merged! Thanks!

This implies adding a ':latest' when no tag was given in the image configuration. Fixes fabric8io#737

Fixes fabric8io#694

PR merged! Thanks!

Otherwise no build configuration will be created. This fixes fabric8io#736. Also made error messages a bit more verbose.

PR merged! Thanks!

…oka/docker-maven-plugin into pr/Katsuya-Tomioka-docker-save-support

rhuss · 2017-03-20T08:07:02Z

I'd probably prefer name over alias as default. $name-$alias.tar.gz if alias is available?

In any other usage scenarios alias typically takes precedence, so we should probably use this here, too.

Also, we need to sanitise the name as it can contain /, too (names with more than two segments are allowed, too).

rhuss · 2017-03-20T08:10:56Z

src/main/java/io/fabric8/maven/docker/SaveMojo.java

+            if (classifier != null) {
+                projectHelper.attachArtifact(project, type, classifier, fileObj);
+            } else {
+                projectHelper.attachArtifact(project, type, fileObj);


We should not do this here, as it will replace the main artefact of the build when no classifier is used.

From the JavaDoc:

Add or replace an artifact to the current project.

and with classifier == null it will replace the main artefact.

I suggest to remove this feature for now and, if needed for a specific use case, introduce it again.

Also I don't think attaching an image like this make sense, as it's probably really huge and your Maven repo (either local or remote) won't cope with suche multi hundred mega byte tars for every version of your artefact.

rhuss · 2017-03-20T08:28:29Z

src/main/java/io/fabric8/maven/docker/access/UrlBuilder.java

@@ -65,6 +65,11 @@ public String deleteImage(String name, boolean force) {
                .build();
    }

+    public String getImage(ImageName name) {
+        return u("images/%s/get", name.getNameWithoutTag())


I don't think we should use the name without tag because according to the Docker reference manual in that case all image of all tags are returned. Actually we should use the full image name here.

* Removed attaching of artifacts as they are too huge anyway * Harmonized properties name to be more specific * Added a bit to documentation * Fixed fetching of all images by using the full name

rhuss · 2017-03-20T09:20:08Z

I updated the PR according to my comments, if you don't mind.

Going to merge this into master now, we can still tune it before doing the next release.

Thanks a lot for you contribution ! 'hope my updates are fine for you.

rhuss · 2017-03-20T09:32:36Z

[merge]

…port PR merged! Thanks!

Katsuya-Tomioka and others added 2 commits February 9, 2017 22:55

docker-save support

32d51b5

Tuned SaveMojo a bit

d9939ca

* Allow an no-argument call to docker:save by chosing sane defaults * Reused ArchiveCompression for selecting the compression mode and a bit more

rhuss force-pushed the docker-save-support branch from 02db086 to d9939ca Compare February 9, 2017 21:56

rhuss added documentation missing needs more tests update changelog labels Feb 9, 2017

Katsuya-Tomioka and others added 7 commits March 7, 2017 17:56

doc and ArchiveCompressionTest

3f697ce

typo

ab8aa8b

Addtional test

148cc81

Merge branch 'master' into docker-save-support

eaf06ac

fixed conflict

3ad28b4

minor doc typo fix

8130400

Merge pull request fabric8io#733 from rhuss/sources-javadoc

c185afd

PR merged! Thanks!

shiroari and others added 12 commits March 15, 2017 17:30

Add PKCS8 private key support

8b8f809

Signed-off-by: Stas Sukhanov <stas.sukhanov@gmail.com>

test

80c7270

Throw exception if private key format is unsupported or invalid

980f0ae

Signed-off-by: Stas Sukhanov <stas.sukhanov@gmail.com>

Changelog update

058fe58

Merge pull request fabric8io#730 from shiroari/private-key-support

d4f5291

PR merged! Thanks!

Add the full image name with tag as part of the description.

96a0672

This implies adding a ':latest' when no tag was given in the image configuration. Fixes fabric8io#737

Fixed order of log arguments

347ed29

Fix for multiple path segments in the docker name

0ff2972

Fixes fabric8io#694

Update changelog for fixes

00209b4

Adapt sample to use multiple name segments

9e6e2e6

Merge pull request fabric8io#738 from rhuss/pr/fulldocker-name-in-desc

f1d78aa

PR merged! Thanks!

Enable properties build only when from or fromExt is set

c2c16e1

Otherwise no build configuration will be created. This fixes fabric8io#736. Also made error messages a bit more verbose.

fusesource-ci and others added 2 commits March 19, 2017 15:01

Merge pull request fabric8io#739 from rhuss/pr/736-property-build

5c371c0

PR merged! Thanks!

Merge branch 'docker-save-support' of https://github.com/Katsuya-Tomi…

f46c40c

…oka/docker-maven-plugin into pr/Katsuya-Tomioka-docker-save-support

rhuss reviewed Mar 20, 2017

View reviewed changes

Update 'docker:save' support

fbf2fd0

* Removed attaching of artifacts as they are too huge anyway * Harmonized properties name to be more specific * Added a bit to documentation * Fixed fetching of all images by using the full name

rhuss removed documentation missing needs more tests update changelog labels Mar 20, 2017

fusesource-ci merged commit 2d23669 into fabric8io:master Mar 20, 2017

rgbj pushed a commit to rgbj/docker-maven-plugin that referenced this pull request Jun 21, 2017

Merge pull request fabric8io#687 from Katsuya-Tomioka/docker-save-sup…

f3ad671

…port PR merged! Thanks!

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

docker-save support #687

docker-save support #687

Katsuya-Tomioka commented Jan 8, 2017

codecov-io commented Jan 8, 2017 •

edited by codecov bot

Loading

rhuss commented Jan 23, 2017

rhuss commented Feb 9, 2017 •

edited

Loading

Katsuya-Tomioka commented Mar 7, 2017

rhuss commented Mar 15, 2017

rhuss commented Mar 20, 2017

rhuss Mar 20, 2017

rhuss Mar 20, 2017

rhuss Mar 20, 2017

rhuss commented Mar 20, 2017

rhuss commented Mar 20, 2017

docker-save support #687

docker-save support #687

Conversation

Katsuya-Tomioka commented Jan 8, 2017

codecov-io commented Jan 8, 2017 • edited by codecov bot Loading

Codecov Report

rhuss commented Jan 23, 2017

rhuss commented Feb 9, 2017 • edited Loading

Katsuya-Tomioka commented Mar 7, 2017

rhuss commented Mar 15, 2017

rhuss commented Mar 20, 2017

rhuss Mar 20, 2017

Choose a reason for hiding this comment

rhuss Mar 20, 2017

Choose a reason for hiding this comment

rhuss Mar 20, 2017

Choose a reason for hiding this comment

rhuss commented Mar 20, 2017

rhuss commented Mar 20, 2017

codecov-io commented Jan 8, 2017 •

edited by codecov bot

Loading

rhuss commented Feb 9, 2017 •

edited

Loading