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

Update to docker-java 3.2.0 #2297

Merged
merged 32 commits into from
Mar 12, 2020
Merged

Update to docker-java 3.2.0 #2297

merged 32 commits into from
Mar 12, 2020

Conversation

bsideup
Copy link
Member

@bsideup bsideup commented Jan 27, 2020

No description provided.

@bsideup bsideup added area/shading type/dependency update dependencies Pull requests that update a dependency file labels Jan 27, 2020
# Conflicts:
#	core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
#	core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@bsideup
Copy link
Member Author

bsideup commented Feb 15, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup
Copy link
Member Author

bsideup commented Feb 20, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup
Copy link
Member Author

bsideup commented Feb 23, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup
Copy link
Member Author

bsideup commented Feb 24, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup
Copy link
Member Author

bsideup commented Feb 24, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup bsideup marked this pull request as ready for review February 24, 2020 12:28
@@ -520,12 +520,12 @@ void checksumFile(File file, Checksum checksum) {
@SneakyThrows(JsonProcessingException.class)
final String hash(CreateContainerCmd createCommand) {
Copy link
Member

Choose a reason for hiding this comment

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

Not consequential to the PR, but is there a reason for this method to be package-private? Should it be @VisibleForTesting?

Copy link
Member Author

Choose a reason for hiding this comment

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

IIRC the idea was to make it protected at some point, but I don't really remember anymore 😅

@bsideup
Copy link
Member Author

bsideup commented Mar 10, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup bsideup added this to the next milestone Mar 10, 2020
@bsideup
Copy link
Member Author

bsideup commented Mar 10, 2020

/AzurePipelines run Windows 10 - Docker for Windows

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bsideup bsideup merged commit 7d5f4c9 into master Mar 12, 2020
@delete-merged-branch delete-merged-branch bot deleted the docker_java_module branch March 12, 2020 20:14
quincy pushed a commit to quincy/testcontainers-java that referenced this pull request May 28, 2020
* Test new `docker-java` module

* global Jitpack repo

* update to the current master of docker-java

* try docker-java-core

* use 3.2.0-rc1

* update to docker-java 3.2.0-rc2

* remove unnecessary dependency

* Update to docker-java 3.2.0-rc3, use their okhttp cmd factory

* post-merge fixes

* Update to docker-java 3.2.0-rc4

* fix JarFileShadingTest

* Add japicmp task

* Update to 3.2.0-rc5

* postpone shading changes

* reduce the changeset

* do not run japicmp on Windows

* try running modules' tests without the checks

* split module runs

* fix the tasks list

* fix the tasks list (2)

* do not disable the checks

* try `postCheckCommand`

* make `postCheckCommand` optional

* Update azure-pipelines.yml

* Update to docker-java 3.2.0

* restore `postCheckCommand`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/shading dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants