Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ ext {
revNats = '2.16.14'
revStan = '2.2.3'
revFlyway = '10.15.2'
revApacheLucene = '10.2.1'
revApacheLucene = (System.getenv('SEARCH_ENGINE') == 'OS') ? '9.12.0' : '8.11.1'
revConductorClient = '4.0.10'
}
1 change: 1 addition & 0 deletions docker/docker-compose-postgres-es7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
context: ../
dockerfile: docker/server/Dockerfile
args:
SEARCH_ENGINE: "ES"
YARN_OPTS: ${YARN_OPTS}
networks:
- internal
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-redis-os.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
context: ../
dockerfile: docker/server/Dockerfile
args:
SEARCH_ENGINE: "OS"
YARN_OPTS: ${YARN_OPTS}
networks:
- internal
Expand Down
4 changes: 4 additions & 0 deletions docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ LABEL maintainer="Orkes OSS <[email protected]>"
COPY . /conductor
WORKDIR /conductor

# Inject search engine build flag into the env
ARG SEARCH_ENGINE
ENV SEARCH_ENGINE=${SEARCH_ENGINE}

# Build the server on run
RUN ./gradlew build -x test
WORKDIR /server/build/libs
Expand Down
4 changes: 3 additions & 1 deletion es7-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ dependencies {

implementation "com.fasterxml.jackson.core:jackson-databind"
implementation "com.fasterxml.jackson.core:jackson-core"


implementation "org.apache.lucene:lucene-core:${revApacheLucene}"

implementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch7}"
implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch7}"

Expand Down
1 change: 1 addition & 0 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-web'
implementation "redis.clients:jedis:${revJedis}"
implementation "org.postgresql:postgresql:${revPostgres}"
implementation "org.apache.lucene:lucene-core:${revApacheLucene}"

implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation ("io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}") {
Expand Down
Loading