Skip to content

Commit 69c6b9f

Browse files
authored
Merge pull request #607 from oracle/develop-70525
Update prerequisites documentation
2 parents 75bf4df + 378df61 commit 69c6b9f

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Before using the operator, you might want to read the [design philosophy](site/d
4545

4646
* Kubernetes 1.10.11+, 1.11.5+, and 1.12.3+ (check with `kubectl version`).
4747
* Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`)
48-
* Docker 17.03.1.ce (check with `docker version`)
48+
* Docker 18.03.1.ce (check with `docker version`)
4949
* Oracle WebLogic Server 12.2.1.3.0
5050

5151
## Set up your Kubernetes cluster

site/developer.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ This guide provides information for developers who wish to understand or contrib
44

55
## Requirements
66

7-
The following software is required to obtain and build the operator:
7+
In addition to the requirements listed in [README](../README.md#prerequisites), the following software is also required to obtain and build the operator:
88

99
* Git (1.8 or later recommended)
10+
* Java Developer Kit (1.8u131 or later recommended, please use 1.8, tests will not work on 1.9 or later versions)
1011
* Apache Maven (3.3 or later recommended)
11-
* Java Developer Kit (1.8u131 or later recommended, not 1.9)
12-
* Docker 17.03.1.ce
1312

1413
The operator is written primarily in Java and BASH shell scripts. The Java code uses features introduced in Java 1.8 -- for example, closures -- but does not use any Java 1.9 feature.
1514

site/installation.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@ When the run completes successfully, the Docker image for the operator will be b
5252

5353
## Build the Docker image for the operator locally
5454

55-
The following software is required to obtain and build the operator:
55+
In addition to the requirements listed in [README](../README.md#prerequisites), the following software is also required to obtain and build the operator:
5656

5757
* Git (1.8 or later recommended)
5858
* Apache Maven (3.3 or later recommended)
59-
* Java Developer Kit (1.8u131 or later recommended, not 1.9)
60-
* Docker 17.03.1.ce
6159

6260
To run the operator in a Kubernetes cluster, you need to build the Docker image and then deploy it to your cluster. The operator is built using Apache Maven, which must be installed first. Maven may be downloaded from the [Apache Maven site](http://maven.apache.org). The GitHub repository should be cloned locally:
6361

0 commit comments

Comments
 (0)