Skip to content

Commit ee31fcd

Browse files
committed
ACS-11197 Update docs link to 26.1
1 parent 3d9208e commit ee31fcd

4 files changed

Lines changed: 9 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ env:
3737
ALF_LICENCE_LOCAL_PATH: /tmp/licence.lic
3838
PYTHON_VERSION: 3.8.12
3939
DTAS_VERSION: v1.7.3
40+
ES_COMMUNITY_IMAGE: quay.io/alfresco/dev:es-community
4041

4142
jobs:
4243
precommit:

scripts/ci/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,11 @@ then
148148
echo "$ES_CONNECTOR_TAG"
149149
fi
150150

151-
docker build -t alfresco-es-indexing-jdbc:latest -f tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile . --build-arg IMAGE_NAME="quay.io/alfresco/alfresco-elasticsearch-live-indexing:${ES_CONNECTOR_TAG%%[[:cntrl:]]}"
151+
# Use es-community image for live-indexing (ES_COMMUNITY_IMAGE can be overridden via environment)
152+
ES_COMMUNITY_IMAGE=${ES_COMMUNITY_IMAGE:-quay.io/alfresco/dev:es-community}
153+
echo "Using live-indexing image: $ES_COMMUNITY_IMAGE"
154+
155+
docker build -t alfresco-es-indexing-jdbc:latest -f tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile . --build-arg IMAGE_NAME="$ES_COMMUNITY_IMAGE"
152156
docker build -t alfresco-es-reindexing-jdbc:latest -f tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile . --build-arg IMAGE_NAME="quay.io/alfresco/alfresco-elasticsearch-reindexing:${ES_CONNECTOR_TAG%%[[:cntrl:]]}"
153157

154158

tests/environment/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ DIGITAL_WORKSPACE_TAG=4.4.1
2323
#By default the connector tag is set to the value of `dependency.elasticsearch-shared.version` maven property.
2424
#Following env variable allow you to override this value. It is useful for testing. It should be left blank on the main branch.
2525
ES_CONNECTOR_TAG=
26+
#Custom live-indexing image for CI testing (es-community)
27+
ES_COMMUNITY_IMAGE=quay.io/alfresco/dev:es-community
2628
#For CMIS Elastic docker-compose - it is default value - it should be changed in before_script for different databases.
2729
CMIS_ALFRESCO_IMAGE=alfresco/alfresco-content-repository:${ALFRESCO_TAG}
2830
DATABASE_ENV_PROPERTIES="-Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.url=jdbc:postgresql://database:5432/alfresco "

tests/environment/docker-compose-cmis-opensearch-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ services:
182182
- elasticsearch
183183

184184
live-indexing:
185-
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:${LIVE_INDEXING_TAG}
185+
image: ${ES_COMMUNITY_IMAGE:-quay.io/alfresco/dev:es-community}
186186
mem_limit: 512m
187187
depends_on:
188188
- elasticsearch

0 commit comments

Comments
 (0)