Merge remote-tracking branch 'origin/chore/add_ci_env' into chore/add…

…_ci_env
ebi-gene-expression-group · Oct 3, 2023 · a669030 · a669030
2 parents dd8e575 + 4f4c998
commit a669030
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docker/dev.env b/docker/dev.env
@@ -3,10 +3,13 @@ PROJECT_NAME=gxa
 GRADLE_WRAPPER_DISTS_VOL_NAME=gradle-wrapper-dists
 GRADLE_RO_DEP_CACHE_VOL_NAME=gradle-ro-dep-cache
 
+WEBAPP_PROPERTIES_VOL_NAME=webapp-properties
+ATLAS_DATA_GXA_VOL_NAME=gxa-data
+ATLAS_DATA_GXA_EXPDESIGN_VOL_NAME=atlas-data-expdesign
 ATLAS_DATA_BIOENTITY_PROPERTIES_VOL_NAME=atlas-data-bioentity-properties
 ATLAS_DATA_EXP_VOL_NAME=atlas-data-exp
-
 ATLAS_DATA_EXPDESIGN_VOL_NAME=atlas-data-expdesign
+
 POSTGRES_HOST=gxa-postgres
 POSTGRES_DB=gxpgxadev
 POSTGRES_USER=atlasdev

diff --git a/docker/prepare-dev-environment/solr/docker-compose.yml b/docker/prepare-dev-environment/solr/docker-compose.yml
@@ -63,14 +63,12 @@ services:
         ./gradlew -PdataFilesLocation=/root \
         -PexperimentFilesLocation=/atlas-data/exp \
         -PexperimentDesignLocation=/atlas-data/expdesign \
-        -PzkHosts=$${ZK_HOSTS} \
-        -PsolrHosts="" \
         -PjdbcUrl=jdbc:postgresql://${POSTGRES_HOST}:5432/${POSTGRES_DB} \
         -PjdbcUsername=${POSTGRES_USER} \
         -PjdbcPassword=${POSTGRES_PASSWORD} \
         -PzkHosts=$${ZK_HOSTS} \
         -PsolrHosts=$${SOLR_HOSTS} \
-        :cli:bootRun --args="bulk-analytics-json --output=/root/experiments-jsonl -e $(echo $${EXP_IDS} | sed -e "s/ /,/g")"
+        :cli:bootRun --args="bulk-analytics-json --output=/root/experiments-jsonl -e $(echo ${EXP_IDS} | sed -e "s/ /,/g")"
 
         cd /root/solr-bulk/bin
         ./create-bulk-analytics-collection.sh