Skip to content

Commit

Permalink
decker preparation for the next release
Browse files Browse the repository at this point in the history
  • Loading branch information
tkohegyi committed Feb 10, 2023
1 parent 379c972 commit f7075fa
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ It is written in Java, and the solution consists of two standalone applications:
* JRE 8 for V1.6.x releases of Wilma
* JRE 7 in case version earlier than V1.6.x in use
* The latest [release](https://github.com/epam/Wilma/releases) of Wilma application downloaded and extracted into a folder.
### Note on V1.6 and V2.0 versions
#### Note on V1.6 and V2.0 versions
Please be noted that there were non-backward compatible changes when Wilma is upgraded from V1.6 to V2.0. Configurations used in V1.6 (that was xml based) cannot be used for configuring V2.0 (which is json based). You should also know that V1.6 release works reliable with HTTP only, because the supported HTTPS protocols (SSLv3, TLS1) become obsolete in the meantime. On the other hand, V2.0 can be used for TLS1.1, TLS 1.2 and even for TLS1.3 - however extra configurations may be necessary and unexpected events may occur (like the used jdk does not support some of these protocols fully). HTTP part shall work without issue.

#### Configuring Components/Services to use Wilma
### Configuring Components/Services to use Wilma
The most simple way to do this is by configuring the Component/Service to use Wilma **as HTTP(S) proxy**.
In case of Java components/services, this can be done by adding a few VM arguments to the run configuration:

Expand All @@ -29,7 +29,7 @@ JAVA_PROXY_FLAGS=-Dhttp.proxyHost=[wilma-url] -Dhttp.proxyPort=[wilma-proxy-port
java ${JAVA_PROXY_FLAGS} ...
```

#### Configure and run Wilma
### Configure and run Wilma

To run Wilma with simplest configuration, just download the release, extract it and run:
`java -jar wilma-x.y.z.jar wilma.conf.properties`
Expand Down Expand Up @@ -58,7 +58,7 @@ Feel free to seek for assistance/advise, or discuss usage scenarios by submittin
* **Docker image** of combined Wilma and Wilma Message Search application is available on DockerHub, see details [here](https://github.com/epam/Wilma/wiki/Docker-image-of-Wilma)

#### Requirements
* JDK 11 (pls use earlier Wilma [releases](https://github.com/epam/Wilma/releases) than V2.0.x when you need to use Java 8 version)
* JDK 15 (pls use earlier Wilma [releases](https://github.com/epam/Wilma/releases) than V2.0.x when you need to use Java 8 version)
* The latest [release](https://github.com/epam/Wilma/releases) of Wilma Message Search application downloaded and extracted into a folder.

#### Running
Expand All @@ -72,7 +72,7 @@ There are several ways you can help us:
* **Write some code.** We would love to see pull requests to this tool. Feel free to contribute (send pull request) on GitHub.

#### Advised working environment
* OpenJDK 15 for V2.0.x
* OpenJDK 15 for V2.5.x
* IntelliJ IDEA Community Edition
* Gradle (included in source) and Git

Expand Down
6 changes: 3 additions & 3 deletions config/docker/Dockerfile-Wilma
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ RUN \
apt-get install -y openjdk-17-jre && \
apt-get upgrade -y && \
rm -rf /var/lib/apt/lists/* && \
wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-application-2.3.480.zip && \
unzip wilma-application-2.3.480.zip && \
wget https://github.com/epam/Wilma/releases/download/V2.5.493/wilma-application-2.5.493.zip && \
unzip wilma-application-2.5.493.zip && \
mv wilma-2.3.480.jar wilma.jar && \
rm -f wilma-application-2.3.480.zip
rm -f wilma-application-2.5.493.zip

COPY start_wilma.sh /data/
RUN \
Expand Down
8 changes: 4 additions & 4 deletions config/docker/Dockerfile-Wilma_and_Wilma_Message_Search
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN \
apt-get upgrade -y && \
apt-get install -y openjdk-17-jdk && \
rm -rf /var/libs/apt/lists/* && \
wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-message-search-2.3.480.zip && \
unzip -o wilma-message-search-2.3.480.zip && \
mv wilma-message-search-2.3.480.jar wilma-message-search.jar && \
rm -f wilma-message-search-2.3.480.zip
wget https://github.com/epam/Wilma/releases/download/V2.5.493/wilma-message-search-2.5.493.zip && \
unzip -o wilma-message-search-2.5.493.zip && \
mv wilma-message-search-2.5.493.jar wilma-message-search.jar && \
rm -f wilma-message-search-2.5.493.zip

COPY start_wilma_and_message_search.sh /data/
RUN \
Expand Down

0 comments on commit f7075fa

Please sign in to comment.