michele.artini
/
dnet-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker conf

This commit is contained in:
Michele Artini 2023-11-10 10:36:20 +01:00
parent 6ae004eb7e
commit 8dd37e2866
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dnet-app/apps/dnet-oai-manager/src/main/java/eu/dnetlib/services/oai/OaiApplication.java
View File

@ -2,10 +2,16 @@ package eu.dnetlib.services.oai;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import eu.dnetlib.common.app.AbstractDnetApp;
import eu.dnetlib.domain.oai.OaiConfiguration;
import eu.dnetlib.domain.oai.OaiMetadataFormat;
import eu.dnetlib.domain.oai.OaiRecord;
import eu.dnetlib.domain.oai.OaiSet;
@SpringBootApplication
@EntityScan(basePackageClasses = { OaiConfiguration.class, OaiSet.class, OaiMetadataFormat.class, OaiRecord.class })
public class OaiApplication extends AbstractDnetApp {
public static void main(final String[] args) {

2
dnet-app/apps/dnet-wf-aggregation-postgres/src/main/java/eu/dnetlib/wfs/output/oai/OaiBackend.java
View File

@ -19,7 +19,7 @@ public class OaiBackend {
@Value("${oai.database.url}")
private String oaiDatabaseUrl;
@Value("${oai.database.user}")
@Value("${oai.database.username}")
private String oaiDatabaseUser;
@Value("${oai.database.password}")

5
docker-compose.dev.yml
View File

@ -127,6 +127,11 @@ services:
- MDSTORES_DATA_DATASOURCE_URL=jdbc:postgresql://db-main:${PG_PORT}/${PG_MDSTORES_DATA_DB}
- MDSTORES_DATA_DATASOURCE_USERNAME=${PG_USER}
- MDSTORES_DATA_DATASOURCE_PASSWORD=${PG_PASSWORD}
- SOLR_URLS=http://solr-1:${SOLR_PORT}/solr
- ZOOKEEPER_SERVER=zoo-1
- OAI_DATABASE_URL=jdbc:postgresql://db-oai:${PG_PORT}/${PG_OAI_DB}
- OAI_DATABASE_USERNAME=${PG_USER}
- OAI_DATABASE_PASSWORD=${PG_PASSWORD}
profiles:
- wfs

4
start.sh
View File

@ -19,8 +19,8 @@ export PG_MDSTORES_DATA_DB=dnet_mdstores_data
export PG_INDEX_DB=dnet_index_configs
export PG_OAI_DB=dnet_oai
export COMPOSE_PROFILES=base,index
#export COMPOSE_PROFILES=base,mail,dsm,vocs,mdstores,wfs,index,contexts,ui
#export COMPOSE_PROFILES=base,index,oai
export COMPOSE_PROFILES=base,mail,dsm,vocs,mdstores,wfs,index,contexts,oai,ui
docker-compose -f docker-compose.dev.yml up --force-recreate --build