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.

Sign up for GitHub

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

- add support for pulling an image once per (reactor) build #512

Merged
merged 1 commit into from
Jul 19, 2016
Merged

- add support for pulling an image once per (reactor) build #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 59 additions & 57 deletions doc/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
* **0.15-SNAPSHOT**
- Dont do redirect when waiting on an HTTP port (#499)
- Removed the container fetch limit of 100 and optimized getting containers by name and image (#513)

- Allow images to only be pulled once per build (useful for reactor projects) ([#504](https://github.com/fabric8io/docker-maven-plugin/issues/504))

>>>>>>> Stashed changes
Copy link
Collaborator

Choose a reason for hiding this comment

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

oops ;-)

* **0.15.9** (2016-06-28)
- Fixed issue when target directory does not exist yet ([#497](https://github.com/fabric8io/docker-maven-plugin/issues/497))

* **0.15.8** (2016-06-27)
- Removed image configuration caching ([#495](https://github.com/fabric8io/docker-maven-plugin/issues/495))
- Fix for tcp wait when used with Docker for Mac ([#430](https://github.com/fabric8io/docker-maven-plugin/issues/430))
- Add warning when assembly is empty when watching a Docker image ([#490](https://github.com/fabric8io/docker-maven-plugin/issues/490))
- Add `docker.skip.build`, `docker.skip.run`, `docker.skip.push` properties and
- Add `docker.skip.build`, `docker.skip.run`, `docker.skip.push` properties and
renamed `docker.skipTags` to `docker.skip.tag` ([#483](https://github.com/fabric8io/docker-maven-plugin/issues/483))
- Reverted jansi back to version 1.11 because of [this issue](https://github.com/fusesource/jansi/issues/58)
- Add new assembly config options `permissions` for fine tuning permissions in the docker.tar ([#477](https://github.com/fabric8io/docker-maven-plugin/issues/477)). Deprecated `ignorePermissions`
Expand All @@ -27,65 +29,65 @@

* **0.15.4** (2016-06-03)
- Update dependencies: Apache HttpClient 4.5.2, JMockit 1.23, ...
- Fix read-only bindings ([#462](https://github.com/fabric8io/docker-maven-plugin/issues/462))
- Fix read-only bindings ([#462](https://github.com/fabric8io/docker-maven-plugin/issues/462))
- Add 'shmSize' as option to the build config ([#463](https://github.com/fabric8io/docker-maven-plugin/issues/463))
- Fixed issue with `memory` and `

* **0.15.3** (2016-05-27)
- Add duration information when pulling, building and pushing images ([#313](https://github.com/fabric8io/docker-maven-plugin/issues/313))
- Fixed logging to always use format strings ([#457](https://github.com/fabric8io/docker-maven-plugin/issues/457))
- Allow extended image names ([#459](https://github.com/fabric8io/docker-maven-plugin/issues/459))
* **0.15.2** (2016-05-19)

* **0.15.2** (2016-05-19)
- More robust response stream parsing ([#436](https://github.com/fabric8io/docker-maven-plugin/issues/436))
- Add `docker.dockerFileDir` and `docker.dockerFile` to the properties configuration provider. ([#438](https://github.com/fabric8io/docker-maven-plugin/issues/438))
- Fix splitting of bind volumes for Windows pathes ([#443](https://github.com/fabric8io/docker-maven-plugin/issues/443))
- Add new build config option `user` for switching the user at the end of the Dockerfile. `docker.user` can be used
for the properties configuration provider ([#441](https://github.com/fabric8io/docker-maven-plugin/issues/441))
- Include dot dirs when creating the build tar ([#446](https://github.com/fabric8io/docker-maven-plugin/issues/446))
- Fix property handler with wait config but empty tcp wait connection ([#451](https://github.com/fabric8io/docker-maven-plugin/issues/451))

* **0.15.1** (2016-05-03)
- Fix push / pull progress bar ([#91](https://github.com/fabric8io/docker-maven-plugin/issues/91))
- Allow empty environment variable ([#434](https://github.com/fabric8io/docker-maven-plugin/issues/434))
- Async log request get now their own HTTP client ([#344](https://github.com/fabric8io/docker-maven-plugin/issues/344)) ([#259](https://github.com/fabric8io/docker-maven-plugin/issues/259))

* **0.15.0** (2016-04-27)
- Be more conservative when no "warnings" are returned on create ([#407](https://github.com/fabric8io/docker-maven-plugin/issues/407))
- Fix parsing of timestamps with numeric timezone ([#410](https://github.com/fabric8io/docker-maven-plugin/issues/410))
- Validate image names to fit Docker conventions ([#423](https://github.com/fabric8io/docker-maven-plugin/issues/423)) ([#419](https://github.com/fabric8io/docker-maven-plugin/issues/419))
- Add support for builds args in external Dockerfiles ([#334](https://github.com/fabric8io/docker-maven-plugin/issues/334))
- Add support for builds args in external Dockerfiles ([#334](https://github.com/fabric8io/docker-maven-plugin/issues/334))
- Move `dockerFileDir` to topLevel `<build>` and introduced `dockerFile` directive
`build>assembly>dockerFileDir` is now deprecated and will be removed.
- Add new packaging "docker" (build + run), "docker-build" (build only) and
- Add new packaging "docker" (build + run), "docker-build" (build only) and
"docker-tar" (creating source) ([#433](https://github.com/fabric8io/docker-maven-plugin/issues/433))
- Add `docker:run` as an alias to `docker:start`
- Expose certain container properties also as Maven properties. By default
the format is `docker.container.<alias>.ip` for the internal IP address of container with alias `<alias>`.
([#198](https://github.com/fabric8io/docker-maven-plugin/issues/198))

* **0.14.2**
- Introduce a mode `try` for `<cleanup>` so that an image gets removed if not being still used.
- Introduce a mode `try` for `<cleanup>` so that an image gets removed if not being still used.
This is the default now, which should be close enough to `true` (except that it won't fail the build
when the image couldn't be removed) ([#401](https://github.com/fabric8io/docker-maven-plugin/issues/401))

* **0.14.1**
- First (test) release performed with a fabric8 CD pipeline. No new features.

* **0.14.0**
- Add support for Docker network and `host`, `bridge` and `container` network modes ([#335](https://github.com/fabric8io/docker-maven-plugin/issues/335))
- Add support for older Maven versions, minimum required version is now 3.0.5 ([#290](https://github.com/fabric8io/docker-maven-plugin/issues/290))
- Update to maven-assembly-plugin 2.6 which fixes issue with line endings on windows ([#127](https://github.com/fabric8io/docker-maven-plugin/issues/127))
- Disabled color output on Windows because ANSI emulation can't be enabled in Maven's sl4j logger which
- Disabled color output on Windows because ANSI emulation can't be enabled in Maven's sl4j logger which
caches system out/err
- Moved to to [fabric8io](https://github.com/orgs/fabric8io/dashboard) as GitHub organization which implies
also changes in the maven coordinates (Maven group-id is now **io.fabric8**)
- Fix wait section in samples ([#385](https://github.com/fabric8io/docker-maven-plugin/issues/385))
- Add logging configuration to property handler
- Add support for a logging driver ([#379](https://github.com/fabric8io/docker-maven-plugin/issues/379))

With version `0.14.0` this plugin moved to the [fabric8](http://fabric8.io) community in order to provide
even better services. This include a change in the Maven coordinates. I.e. the Maven group id is now **io.fabric8**
even better services. This include a change in the Maven coordinates. I.e. the Maven group id is now **io.fabric8**
(formerly: "org.jolokia"). Please adapt your pom files accordingly.

* **0.13.9**
Expand All @@ -97,26 +99,26 @@ even better services. This include a change in the Maven coordinates. I.e. the M
- Add system property `docker.nocache` to disable build caching globally ([#349](https://github.com/fabric8io/docker-maven-plugin/issues/349))
- Add support for '.maven-dockerignore' for excluding certain files in plain Dockerfile build ([#362](https://github.com/fabric8io/docker-maven-plugin/issues/362))
- If naming strategy is "alias" stop only the container with the given alias with `docker:stop` ([#359](https://github.com/fabric8io/docker-maven-plugin/issues/359))
- Fix that containers without d-m-p label where still stopped
- Fix that containers without d-m-p label where still stopped
- Add support for OpenShift login (use `-DuseOpenShiftAuth` for enabling this) ([#350](https://github.com/fabric8io/docker-maven-plugin/issues/350))
- Add support for dedicated pull and push registry configuration respectively ([#351](https://github.com/fabric8io/docker-maven-plugin/issues/351))

* **0.13.7**
- Fix default for "cleanup" in build configuration to `true` (as documented) ([#338](https://github.com/fabric8io/docker-maven-plugin/issues/338))
- Fix dynamic host property update in port mapping ([#323](https://github.com/fabric8io/docker-maven-plugin/issues/323))
- New goal 'docker:source' for attaching a Docker tar archive to the Maven project with an classifier "docker-<alias>" ([#311](https://github.com/fabric8io/docker-maven-plugin/issues/311))
- Fix dynamic host property update in port mapping ([#323](https://github.com/fabric8io/docker-maven-plugin/issues/323))
- New goal 'docker:source' for attaching a Docker tar archive to the Maven project with an classifier "docker-<alias>" ([#311](https://github.com/fabric8io/docker-maven-plugin/issues/311))
- Be more careful with chowning the user when <user> is used in an assembly ([#336](https://github.com/fabric8io/docker-maven-plugin/issues/336))
- Move VOLUME to the end of the Dockerfile to allow initialization via RUN commands ([#341](https://github.com/fabric8io/docker-maven-plugin/issues/341))
- Allow multiple configurations with different Docker hosts again ([#320](https://github.com/fabric8io/docker-maven-plugin/issues/320))
- `docker:start` blocks now only when system property docker.follow is given ([#249](https://github.com/fabric8io/docker-maven-plugin/issues/249))
- Allow multiple configurations with different Docker hosts again ([#320](https://github.com/fabric8io/docker-maven-plugin/issues/320))
- `docker:start` blocks now only when system property docker.follow is given ([#249](https://github.com/fabric8io/docker-maven-plugin/issues/249))
- `docker:stop` only stops containers started by this plugin by default ([#87](https://github.com/fabric8io/docker-maven-plugin/issues/87))
- Lookup `~/.docker/config.json` for registry credentials as fallback ([#147](https://github.com/fabric8io/docker-maven-plugin/issues/147))

* **0.13.6**
- Don't use user from image when pulling base images ([#147](https://github.com/fabric8io/docker-maven-plugin/issues/147))
- Add a new assembly descriptor reference `hawt-app` for using assemblies created by
- Add a new assembly descriptor reference `hawt-app` for using assemblies created by
[hawt-app](https://github.com/fabric8io/fabric8/tree/master/hawt-app-maven-plugin)

* **0.13.5**
- Improvements for `docker:watch` ([#288](https://github.com/fabric8io/docker-maven-plugin/issues/288))
- Add parameter `kill` to `<watch>` configuration for waiting before
Expand All @@ -125,10 +127,10 @@ even better services. This include a change in the Maven coordinates. I.e. the M
`docker.logStdout` to show logs nevertheless to stdout ([#287](https://github.com/fabric8io/docker-maven-plugin/issues/287))
- Support `watchMode == copy` for copying changed assembly files
into a running container ([#268](https://github.com/fabric8io/docker-maven-plugin/issues/268))
- Add a `target/classpath` file to the assembly as `classpath` for
- Add a `target/classpath` file to the assembly as `classpath` for
`artifact-with-dependencies` predefined assembly descriptor ([#283](https://github.com/fabric8io/docker-maven-plugin/issues/283))
- Disable Apache HTTP Client retry in WaitUtil ([#297](https://github.com/fabric8io/docker-maven-plugin/issues/297))

* **0.13.4**
- Support explicit exec arguments for `start.cmd` and
`start.entrypoint`. ([#253](https://github.com/fabric8io/docker-maven-plugin/issues/253))
Expand All @@ -148,7 +150,7 @@ even better services. This include a change in the Maven coordinates. I.e. the M
- Add logic to specify exec commands during postStart and preStop
([#272](https://github.com/fabric8io/docker-maven-plugin/issues/272))
- Fixed docker:watch bug when watching on plain files

* **0.13.3**
- Allow dangling images to be cleaned up after build
([#20](https://github.com/fabric8io/docker-maven-plugin/issues/20))
Expand Down Expand Up @@ -189,15 +191,15 @@ even better services. This include a change in the Maven coordinates. I.e. the M
([#195](https://github.com/fabric8io/docker-maven-plugin/issues/195))
- Allow volume mounting from external containers
([#73](https://github.com/fabric8io/docker-maven-plugin/issues/73))

* **0.13.1**
- Allow autoPull to be forced on docker:build and docker:start
([#96](https://github.com/fabric8io/docker-maven-plugin/issues/96))
- Respect username when looking up credentials for a Docker registry
([#174](https://github.com/fabric8io/docker-maven-plugin/issues/174))
- Add "force=1" to push for Fedora/CentOs images allowing to push to
docker hub

Note that the default registry has been changed to `docker.io` as
docker hub doesn't use `registry.hub.docker.com` as the default
registry and refused to authenticate against this registry. For
Expand All @@ -224,16 +226,16 @@ registry to Docker hub.
([#201](https://github.com/fabric8io/docker-maven-plugin/issues/201))
- Support for LABEL for build and run.

Note that since version 0.13.0 this plugin requires Docker API version v1.17 or later in order to support labels.
Note that since version 0.13.0 this plugin requires Docker API version v1.17 or later in order to support labels.

The watch feature has changed: Instead of using paramters like
`docker.watch` or `docker.watch.interval` for `docker:start` a
dedicated `docker:watch` has been introduced. Also the
`<run><watch>...</watch></run>` configuration has been moved one level
up so that `<watch>` and `<run>` are on the same level. Please refer
to the [manual](manual.md#watching-for-image-changes) for an in depth
explanation of the much enhanced watch functionality.

* **0.12.0**
- Allow CMD and ENTRYPOINT with shell and exec arguments
([#130](https://github.com/fabric8io/docker-maven-plugin/issues/130))
Expand All @@ -245,37 +247,37 @@ explanation of the much enhanced watch functionality.
([#145](https://github.com/fabric8io/docker-maven-plugin/issues/145))
- Break build if log check or URL check runs into a timeout
([#173](https://github.com/fabric8io/docker-maven-plugin/issues/173))

Please note that for consistencies sake `<command>` has been renamed
to `<cmd>` which contains inner elements to match better the
equivalent Dockerfile argument. The update should be trivial and easy
to spot since a build will croak immediately.

The old format

````xml
<build>
````xml
<build>
<command>java -jar /server.jar</command>
</build>
````

becomes now

````xml
<build>
<cmd>
<exec>
<arg>java</arg>
````xml
<build>
<cmd>
<exec>
<arg>java</arg>
<arg>-jar</arg>
<arg>/server.jar</arg>
</exec>
</cmd>
</build>
</exec>
</cmd>
</build>
````

or

````xml
````xml
<build>
<cmd>
<shell>java -jar /server.jar</shell>
Expand Down Expand Up @@ -304,7 +306,7 @@ depending on whether you prefer the `exec` or `shell` form.
([#169](https://github.com/fabric8io/docker-maven-plugin/issues/169))
- Fixed registry authentication lookup
([#146](https://github.com/fabric8io/docker-maven-plugin/issues/146))

* **0.11.4**
- Fixed documentation for available properties
- Changed property `docker.assembly.exportBase` to
Expand All @@ -323,11 +325,11 @@ depending on whether you prefer the `exec` or `shell` form.
- Added support for inline assemblies (#157, #158)
- Add support for variable substitution is environment declarations
([#137](https://github.com/fabric8io/docker-maven-plugin/issues/137))
- Use Tar archive as intermediate container when creating image ([#139](https://github.com/fabric8io/docker-maven-plugin/issues/139))
- Use Tar archive as intermediate container when creating image ([#139](https://github.com/fabric8io/docker-maven-plugin/issues/139))
- Better error handling for Docker errors wrapped in JSON response
only
([#167](https://github.com/fabric8io/docker-maven-plugin/issues/167))

* **0.11.3**
- Add support for removeVolumes in `docker:stop` configuration
([#120](https://github.com/fabric8io/docker-maven-plugin/issues/120))
Expand All @@ -343,7 +345,7 @@ depending on whether you prefer the `exec` or `shell` form.
([#128](https://github.com/fabric8io/docker-maven-plugin/issues/128))
- Documentation improvements (#107, #121)
- Allow to use a dockerFileDir without any assembly

* **0.11.2**
- Fix maven parse error when specifying restart policy
([#99](https://github.com/fabric8io/docker-maven-plugin/issues/99))
Expand Down Expand Up @@ -373,7 +375,7 @@ depending on whether you prefer the `exec` or `shell` form.
(#76, #77, #88)
- Fix for stopping containers without tag
([#86](https://github.com/fabric8io/docker-maven-plugin/issues/86))

* **0.11.0**
- Add support for binding/exporting containers during startup
([#55](https://github.com/fabric8io/docker-maven-plugin/issues/55))
Expand All @@ -399,7 +401,7 @@ Please note, that the syntax for binding volumes from another
container has changed slightly in 0.10.6. See
"[Volume binding](manual.md#volume-binding)" for details but in short:

````xml
````xml
<run>
<volumes>
<from>data</from>
Expand Down Expand Up @@ -431,20 +433,20 @@ but in short:
<build>
...
<exportDir>/export</exportDir>
<assemblyDescriptor>src/main/docker/assembly.xml</assemblyDescriptor>
</build>
<assemblyDescriptor>src/main/docker/assembly.xml</assemblyDescriptor>
</build>
````

becomes

````xml
<build>
...
...
<assembly>
<basedir>/export</basedir>
<descriptor>assembly.xml</descriptor>
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
</build>
````

* **0.10.5**
Expand Down
7 changes: 3 additions & 4 deletions src/main/asciidoc/inc/_global-configuration.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ be specified by the certPath or machine configuration, or by the
| `docker.autoCreate` `CustomNetworks`

| *autoPull*
| By default external images (base image for building or images to
start) are downloaded automatically if they don't exist locally.
With this options this can be switched off by setting this value to `off`. Checking for a newer version of an image and downloading it if it
exists can be forced by setting this value to `always`. This will force an image to be always pulled. This is true for any base image during build and for any image during run which has no `<build>` section. Valid values are `on`, `off` or `always`.
| Valid values: `on|off|always|once`. By default external images (base image for building or images to start) are downloaded automatically if they don't exist locally.
This feature can be turned off by setting this value to `off`. If you want to check for a newer version of an image and download it if it exists, set this value to `always`.
If you are running a `reactor` build, you may set this value to `once` so the image is only checkedn and pulled once for the entire build.
| `docker.autoPull`

| *certPath*
Expand Down
Loading