Skip to content

Commit

Permalink
Merge Fix OpenSSL into Branch 1.4 (#1850)
Browse files Browse the repository at this point in the history
* Prepare for next version

* Update OpenSSL to version 1.0.2g for Docker image
  • Loading branch information
Frannie-Ludmilla authored and diegomartinez-stratio committed Apr 27, 2017
1 parent 332cb2f commit 6bf137a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,4 @@
* Input **RabbitMq**
* Full-Text operator
* Accumulator operator
* Last Value operator
* Last Value operator
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ hose {
RPMARCH = 'noarch'
EXPOSED_PORTS = [9090]
BASEIMG = 'stratio/spark-krb-dispatcher-support:2.1.0'
DOCKERFILECOMMAND = 'WORKDIR / \n RUN apt-get update -y && apt-get install -y curl wget jq vim && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java && wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 && chmod +x jq-linux64 && mv jq-linux64 /usr/bin/jq'
DOCKERFILECOMMAND = 'WORKDIR / \n RUN apt-get update -y && apt-get install -y curl wget php5-curl make jq vim && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java && curl https://www.openssl.org/source/openssl-1.0.2g.tar.gz | tar xz && cd openssl-1.0.2g && sudo ./config && sudo make && sudo make install && sudo ln -sf /usr/local/ssl/bin/openssl /usr/bin/openssl && wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 && chmod +x jq-linux64 && mv jq-linux64 /usr/bin/jq'


ITSERVICES = [
Expand Down
2 changes: 1 addition & 1 deletion serving-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
<artifactId>scalaj-http_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
</project>
</project>

0 comments on commit 6bf137a

Please sign in to comment.