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

Jump to bottom

Add additional constructor to OracleContainer #734

Merged
merged 5 commits into from
Jun 12, 2018
Merged

Add additional constructor to OracleContainer #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb97b31
Add additional constructor to OracleContainer
rwiskerke Jun 5, 2018
a479d6e
Update changelog with PR734 information
rwiskerke Jun 11, 2018
7786be3
Merge branch 'master' into master
rwiskerke Jun 11, 2018
5cd020f
Update CHANGELOG.md
kiview Jun 12, 2018
c788bdb
Merge branch 'master' into master
kiview Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
- Use `quay.io/testcontainers/ryuk` instead of `bsideup/ryuk` ([\#721](https://github.com/testcontainers/testcontainers-java/pull/721))
- Added Couchbase module ([\#688](https://github.com/testcontainers/testcontainers-java/pull/688))
- Changed **internal** port of KafkaContainer back to 9092 ([\#733](https://github.com/testcontainers/testcontainers-java/pull/733))
- Add support for Dockerfile based images to OracleContainer ([\#734](https://github.com/testcontainers/testcontainers-java/pull/734))

## [1.7.3] - 2018-05-16

Expand Down
6 changes: 6 additions & 0 deletions modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import org.testcontainers.utility.TestcontainersConfiguration;

import java.util.concurrent.Future;

/**
* @author gusohal
*/
Expand Down Expand Up @@ -32,6 +34,10 @@ public OracleContainer(String dockerImageName) {
super(dockerImageName);
}

public OracleContainer(Future<String> dockerImageName) {
super(dockerImageName);
}

@Override
protected Integer getLivenessCheckPort() {
return getMappedPort(ORACLE_PORT);
Expand Down