Skip to content

Commit 1214dac

Browse files
kenshin54kenshin54
committed
Merge remote-tracking branch 'docker-java/master' into merge-1.3.2
Conflicts: pom.xml src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java src/main/java/com/github/dockerjava/core/DockerClientImpl.java src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java src/main/resources/docker.io.properties src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
2 parents 17ade0a + d6fcccf commit 1214dac

89 files changed

Lines changed: 2946 additions & 450 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
language: java
2+
jdk:
3+
- oraclejdk7
4+
after_success:
5+
- echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
6+
- mvn deploy -DskipITs --settings ~/settings.xml

‎CHANGELOG.md‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
Change Log
2+
===
3+
4+
docker-java-0.10.4
5+
---
6+
7+
* [#108](https://github.com/docker-java/docker-java/pull/108) Support tag in push image command
8+
* [#106](https://github.com/docker-java/docker-java/pull/106) Allow to manage Linux capabilities in CreateContainerCmd
9+
* [#105](https://github.com/docker-java/docker-java/pull/105) Allow to pass HostConfig when creating a container
10+
* [#103](https://github.com/docker-java/docker-java/pull/103) Make GoLangMatchFileFilter work on Windows
11+
* [#102](https://github.com/docker-java/docker-java/pull/102) Downgraded jackson-jaxrs dependency version
12+
* [#101](https://github.com/docker-java/docker-java/pull/101) list filtered images as described in the remote api docs
13+
* [#100](https://github.com/docker-java/docker-java/pull/100) Add support for .dockercfg files to handle auth for push command
14+
* [#95](https://github.com/docker-java/docker-java/pull/95) Add support for .dockerignore files
15+
* [#92](https://github.com/docker-java/docker-java/pull/92) Add travis-ci support
16+
* [#90](https://github.com/docker-java/docker-java/pull/90) Update DockerClientBuilder.java
17+
* [#88](https://github.com/docker-java/docker-java/pull/88) Add support for private repositories and pull/push authentication
18+
19+
docker-java-0.10.3
20+
---
21+
22+
* [#87](https://github.com/docker-java/docker-java/pull/87) Improve adding of port bindings
23+
* [#83](https://github.com/docker-java/docker-java/pull/83) Loading of custom DockerCmdExecFactory
24+
* [#81](https://github.com/docker-java/docker-java/pull/81) Env config
25+
* [#82](https://github.com/docker-java/docker-java/pull/82) Allow multiple port bindings per ExposedPort
26+
* [#80](https://github.com/docker-java/docker-java/pull/80) explicitly use the latest image version
27+
* [#79](https://github.com/docker-java/docker-java/pull/79) Move slow tests to integration test phase, enable tests by default
28+
* [#76](https://github.com/docker-java/docker-java/pull/76) New enum \"InternetProtocol\" for supported IP protocols replaces \"scheme\"
29+
* [#75](https://github.com/docker-java/docker-java/pull/75) Use ExposedPort.toString() in serialization
30+
* [#74](https://github.com/docker-java/docker-java/pull/74) Use project.build.sourceEncoding in compiler
31+
* [#73](https://github.com/docker-java/docker-java/pull/73) Improve parsing and serialization of Link
32+
* [#70](https://github.com/docker-java/docker-java/pull/70) Improve instantiation and serialization of Bind
33+
34+
docker-java-0.10.2
35+
---
36+
37+
* [#69](https://github.com/docker-java/docker-java/pull/69) Use canonical form of Docker folder when building TAR files
38+
* [#68](https://github.com/docker-java/docker-java/pull/68) Set Jersey client CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE
39+
* [#67](https://github.com/docker-java/docker-java/pull/67) typo in README.md
40+
* [#65](https://github.com/docker-java/docker-java/pull/65) Added static method udp in ExposedPort
41+
* [#63](https://github.com/docker-java/docker-java/pull/63) Bind.parse() fails when access mode is specified
42+
* [#57](https://github.com/docker-java/docker-java/pull/57) Add streaming events API
43+
* [#59](https://github.com/docker-java/docker-java/pull/59) Update readme to include corrected api example
44+
* [#2](https://github.com/docker-java/docker-java/pull/2) Move to new maven coordinate com.github.docker-java:docker-java
45+
* [#56](https://github.com/docker-java/docker-java/pull/56) Update README.md
46+
* [#58](https://github.com/docker-java/docker-java/pull/58) Code clear and bug fix
47+
48+
docker-java-0.10.1
49+
---
50+
51+
* [#49](https://github.com/docker-java/docker-java/pull/49) Allow user to check where volume is binded on host
52+
* [#47](https://github.com/docker-java/docker-java/pull/47) let CompressArchiveUtil preserve executable flags
53+
* [#46](https://github.com/docker-java/docker-java/pull/46) Fixes to AttachContainerCmd and CreateContainerCmd.
54+
55+
docker-java-0.10.0
56+
---
57+
58+
* [#45](https://github.com/docker-java/docker-java/pull/45) Fix Issue #44 Adjusting DNS property type to be a String array as specified by the Doc...
59+
* [#38](https://github.com/docker-java/docker-java/pull/38) Remove special-case for one \":\" from PullCommand
60+
* [#37](https://github.com/docker-java/docker-java/pull/37) Starts v0.10.0
61+
* [#35](https://github.com/docker-java/docker-java/pull/35) Exposing the withTTY method for container creation.
62+
63+
docker-java-0.9.1
64+
---
65+
66+
* [#31](https://github.com/docker-java/docker-java/pull/31) Change VolumesFrom to handle array
67+
* [#29](https://github.com/docker-java/docker-java/pull/29) Makes Config a public, immutable class with a builder
68+
* [#22](https://github.com/docker-java/docker-java/pull/22) Fixes for startContainerCmd
69+
* [#19](https://github.com/docker-java/docker-java/pull/19) Add missing options to BuildCmd and set them to match Docker client.
70+
* [#16](https://github.com/docker-java/docker-java/pull/16) Build image improvements
71+
72+
docker-java-0.9.0
73+
---
74+
75+
* [#14](https://github.com/docker-java/docker-java/pull/14) Use RegEx to match ADD command from Dockerfile.
76+
* [#9](https://github.com/docker-java/docker-java/pull/9) Add a build command accepting a tar as a InputStream, so we can build the Dockerfile TAR on the fly without a temporary folder.
77+
78+
docker-java-0.8.2
79+
---
80+
81+
* [#2](https://github.com/docker-java/docker-java/pull/2) Move to new maven coordinate com.github.docker-java:docker-java
82+
* [#1](https://github.com/docker-java/docker-java/pull/1) Merge
83+
* [#2](https://github.com/docker-java/docker-java/pull/2) Move to new maven coordinate com.github.docker-java:docker-java
84+
* [#66](https://github.com/docker-java/docker-java/pull/66) Backport the new structure to Jersey 1.18
85+
* [#65](https://github.com/docker-java/docker-java/pull/65) Added static method udp in ExposedPort
86+
* [#61](https://github.com/docker-java/docker-java/pull/61)
87+
* [#60](https://github.com/docker-java/docker-java/pull/60) Added additional callback methods to EventCallback
88+
* [#1](https://github.com/docker-java/docker-java/pull/1) Merge
89+
* [#55](https://github.com/docker-java/docker-java/pull/55)
90+
* [#58](https://github.com/docker-java/docker-java/pull/58) Code clear and bug fix
91+
* [#54](https://github.com/docker-java/docker-java/pull/54)
92+
* [#3](https://github.com/docker-java/docker-java/pull/3)
93+
* [#2](https://github.com/docker-java/docker-java/pull/2) Move to new maven coordinate com.github.docker-java:docker-java
94+
* [#1](https://github.com/docker-java/docker-java/pull/1) Merge
95+
* [#34](https://github.com/docker-java/docker-java/pull/34)
96+
* [#36](https://github.com/docker-java/docker-java/pull/36)
97+
* [#37](https://github.com/docker-java/docker-java/pull/37) Starts v0.10.0
98+
* [#32](https://github.com/docker-java/docker-java/pull/32)
99+
100+
docker-java-0.8.1
101+
---
102+
103+
104+
docker-java-0.8.1
105+
---
106+
107+
* [#28](https://github.com/docker-java/docker-java/pull/28) Improves use of docker-java in unit tests
108+
* [#30](https://github.com/docker-java/docker-java/pull/30) Add ping method
109+
* [#27](https://github.com/docker-java/docker-java/pull/27) Added a close method to DockerClient
110+
* [#26](https://github.com/docker-java/docker-java/pull/26)
111+
* [#24](https://github.com/docker-java/docker-java/pull/24)
112+
* [#23](https://github.com/docker-java/docker-java/pull/23)
113+
* [#22](https://github.com/docker-java/docker-java/pull/22) Fixes for startContainerCmd
114+
* [#20](https://github.com/docker-java/docker-java/pull/20)
115+
* [#19](https://github.com/docker-java/docker-java/pull/19) Add missing options to BuildCmd and set them to match Docker client.
116+
* [#18](https://github.com/docker-java/docker-java/pull/18) Added Container-Linking
117+
* [#16](https://github.com/docker-java/docker-java/pull/16) Build image improvements
118+
* [#15](https://github.com/docker-java/docker-java/pull/15) Collection of changes driven by use in gradle-docker and on Windows
119+
* [#14](https://github.com/docker-java/docker-java/pull/14) Use RegEx to match ADD command from Dockerfile.
120+
* [#9](https://github.com/docker-java/docker-java/pull/9) Add a build command accepting a tar as a InputStream, so we can build the Dockerfile TAR on the fly without a temporary folder.
121+
* [#5](https://github.com/docker-java/docker-java/pull/5) add paused field in ContainerInspectResponse
122+
* [#6](https://github.com/docker-java/docker-java/pull/6)

‎README.md‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
12
# docker-java
23

34
Java API client for [Docker](http://docs.docker.io/ "Docker")
@@ -16,11 +17,13 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/
1617
* Maven 3.0.5
1718
* Docker daemon running
1819

19-
The Maven build includes integration tests which are using a localhost instance of Docker and require manual setup. Make sure you have a local Docker daemon running and then provide your https://registry.hub.docker.com/account/login/ information via system properties:
20+
If you need SSL, then you'll need to put your `*.pem` file into `~/.docker/`, if you're using boot2docker, do this:
21+
22+
$ ln -s /Users/alex.collins/.boot2docker/certs/boot2docker-vm .docker
2023

21-
$ mvn clean install -Ddocker.io.username=... -Ddocker.io.password=... -Ddocker.io.email=...
24+
Build and run integration tests as follows:
2225

23-
_If your Docker server is remote, add its URL like this: `-Ddocker.io.url=https://...:2376`._
26+
$ mvn clean install
2427

2528
If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests:
2629

@@ -56,19 +59,19 @@ Run build without integration tests:
5659
<dependency>
5760
<groupId>com.github.docker-java</groupId>
5861
<artifactId>docker-java</artifactId>
59-
<version>0.10.2</version>
62+
<version>0.10.3</version>
6063
</dependency>
6164

6265
### Latest SNAPSHOT version
66+
You can find the latest SNAPSHOT version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
67+
6368

6469
<dependency>
6570
<groupId>com.github.docker-java</groupId>
6671
<artifactId>docker-java</artifactId>
67-
<version>0.10.3-SNAPSHOT</version>
72+
<version>0.10.4-SNAPSHOT</version>
6873
</dependency>
6974

70-
Latest SNAPSHOT is published to maven repo: https://oss.sonatype.org/content/groups/public via ![Build on CloudBees](http://cloudbees.prod.acquia-sites.com/sites/default/files/styles/large/public/Button-Powered-by-CB.png?itok=uMDWINfY)
71-
7275
## Documentation
7376

7477
For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command "Test cases")
@@ -79,9 +82,10 @@ There are a couple of configuration items, all of which have sensible defaults:
7982

8083
* `url` The Docker URL, e.g. `https://localhost:2376`.
8184
* `version` The API version, e.g. `1.15`.
82-
* `username` Your repository username (required to push containers).
83-
* `password` Your repository password.
84-
* `email` Your repository email.
85+
* `username` Your registry username (required to push containers).
86+
* `password` Your registry password.
87+
* `email` Your registry email.
88+
* `serverAddress` Your registry's address.
8589
* `dockerCertPath` Path to the docker certs.
8690

8791
There are three ways to configure, in descending order of precedence:
@@ -95,6 +99,7 @@ In your application, e.g.
9599
.withUsername("dockeruser")
96100
.withPassword("ilovedocker")
97101
.withEmail("dockeruser@github.com")
102+
.withServerAddress("https://index.docker.io/v1/")
98103
.withDockerCertPath("/home/user/.docker")
99104
.build();
100105
DockerClient docker = DockerClientBuilder.getInstance(config).build();
@@ -106,6 +111,7 @@ In your application, e.g.
106111
docker.io.username=dockeruser
107112
docker.io.password=ilovedocker
108113
docker.io.email=dockeruser@github.com
114+
docker.io.serverAddress=https://index.docker.io/v1/
109115
docker.io.dockerCertPath=/home/user/.docker
110116

111117

‎pom.xml‎

Lines changed: 66 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
<groupId>com.github.docker-java</groupId>
1111
<artifactId>docker-java</artifactId>
1212
<packaging>jar</packaging>
13+
<<<<<<< HEAD
1314
<version>1.3</version>
1415

16+
=======
17+
<version>0.10.5-SNAPSHOT</version>
18+
19+
>>>>>>> docker-java/master
1520
<name>docker-java</name>
1621
<url>https://github.com/docker-java/docker-java</url>
1722
<description>Java API Client for Docker</description>
@@ -52,11 +57,11 @@
5257
<jersey.version>2.11</jersey.version>
5358
<jersey-apache-client4.version>1.9</jersey-apache-client4.version>
5459

55-
<jackson-jaxrs.version>2.3.3</jackson-jaxrs.version>
60+
<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
5661

5762
<httpclient.version>4.2.5</httpclient.version>
5863
<commons-compress.version>1.5</commons-compress.version>
59-
<commons-codec.version>1.8</commons-codec.version>
64+
<commons-codec.version>1.8</commons-codec.version>
6065
<commons-io.version>2.3</commons-io.version>
6166
<commons-lang.version>2.6</commons-lang.version>
6267
<slf4j-api.version>1.7.5</slf4j-api.version>
@@ -94,11 +99,11 @@
9499
<artifactId>jackson-jaxrs-json-provider</artifactId>
95100
<version>${jackson-jaxrs.version}</version>
96101
</dependency>
97-
<!-- <dependency> -->
98-
<!-- <groupId>org.glassfish.jersey.connectors</groupId> -->
99-
<!-- <artifactId>jersey-jetty-connector</artifactId> -->
100-
<!-- <version>${jersey.version}</version> -->
101-
<!-- </dependency> -->
102+
<!-- <dependency> -->
103+
<!-- <groupId>org.glassfish.jersey.connectors</groupId> -->
104+
<!-- <artifactId>jersey-jetty-connector</artifactId> -->
105+
<!-- <version>${jersey.version}</version> -->
106+
<!-- </dependency> -->
102107
<dependency>
103108
<groupId>org.glassfish.jersey.core</groupId>
104109
<artifactId>jersey-client</artifactId>
@@ -110,11 +115,11 @@
110115
<artifactId>commons-compress</artifactId>
111116
<version>${commons-compress.version}</version>
112117
</dependency>
113-
<dependency>
114-
<groupId>commons-codec</groupId>
115-
<artifactId>commons-codec</artifactId>
116-
<version>${commons-codec.version}</version>
117-
</dependency>
118+
<dependency>
119+
<groupId>commons-codec</groupId>
120+
<artifactId>commons-codec</artifactId>
121+
<version>${commons-codec.version}</version>
122+
</dependency>
118123
<dependency>
119124
<groupId>commons-lang</groupId>
120125
<artifactId>commons-lang</artifactId>
@@ -145,16 +150,16 @@
145150
</dependency>
146151

147152
<dependency>
148-
<groupId>com.google.guava</groupId>
149-
<artifactId>guava</artifactId>
150-
<version>${guava.version}</version>
151-
</dependency>
152-
153-
<dependency>
154-
<groupId>org.bouncycastle</groupId>
155-
<artifactId>bcpkix-jdk15on</artifactId>
156-
<version>${bouncycastle.version}</version>
157-
</dependency>
153+
<groupId>com.google.guava</groupId>
154+
<artifactId>guava</artifactId>
155+
<version>${guava.version}</version>
156+
</dependency>
157+
158+
<dependency>
159+
<groupId>org.bouncycastle</groupId>
160+
<artifactId>bcpkix-jdk15on</artifactId>
161+
<version>${bouncycastle.version}</version>
162+
</dependency>
158163

159164
<!-- /// Test /////////////////////////// -->
160165
<dependency>
@@ -306,6 +311,32 @@
306311
</execution>
307312
</executions>
308313
</plugin>
314+
<plugin>
315+
<groupId>org.apache.maven.plugins</groupId>
316+
<artifactId>maven-source-plugin</artifactId>
317+
<version>2.2.1</version>
318+
<executions>
319+
<execution>
320+
<id>attach-sources</id>
321+
<goals>
322+
<goal>jar-no-fork</goal>
323+
</goals>
324+
</execution>
325+
</executions>
326+
</plugin>
327+
<plugin>
328+
<groupId>org.apache.maven.plugins</groupId>
329+
<artifactId>maven-javadoc-plugin</artifactId>
330+
<version>2.9.1</version>
331+
<executions>
332+
<execution>
333+
<id>attach-javadocs</id>
334+
<goals>
335+
<goal>jar</goal>
336+
</goals>
337+
</execution>
338+
</executions>
339+
</plugin>
309340
</plugins>
310341
</pluginManagement>
311342
<plugins>
@@ -355,12 +386,24 @@
355386
<configuration>
356387
<groups>integration</groups>
357388
<includes>
358-
<include>**/*Test.java</include>
389+
<include>**/*Test.java</include>
359390
</includes>
360391
</configuration>
361392
</execution>
362393
</executions>
394+
<<<<<<< HEAD
363395
</plugin> -->
396+
=======
397+
</plugin>
398+
<plugin>
399+
<groupId>org.apache.maven.plugins</groupId>
400+
<artifactId>maven-source-plugin</artifactId>
401+
</plugin>
402+
<plugin>
403+
<groupId>org.apache.maven.plugins</groupId>
404+
<artifactId>maven-javadoc-plugin</artifactId>
405+
</plugin>
406+
>>>>>>> docker-java/master
364407
</plugins>
365408
</build>
366409

@@ -382,33 +425,13 @@
382425
</execution>
383426
</executions>
384427
</plugin>
385-
386428
<plugin>
387429
<groupId>org.apache.maven.plugins</groupId>
388430
<artifactId>maven-source-plugin</artifactId>
389-
<version>2.2.1</version>
390-
<executions>
391-
<execution>
392-
<id>attach-sources</id>
393-
<goals>
394-
<goal>jar-no-fork</goal>
395-
</goals>
396-
</execution>
397-
</executions>
398431
</plugin>
399-
400432
<plugin>
401433
<groupId>org.apache.maven.plugins</groupId>
402434
<artifactId>maven-javadoc-plugin</artifactId>
403-
<version>2.9.1</version>
404-
<executions>
405-
<execution>
406-
<id>attach-javadocs</id>
407-
<goals>
408-
<goal>jar</goal>
409-
</goals>
410-
</execution>
411-
</executions>
412435
</plugin>
413436
</plugins>
414437
</build>

0 commit comments

Comments
 (0)