diff --git a/README.md b/README.md index 51a18252..c988fe4d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ LinkedPipes ETL is an RDF based, lightweight ETL tool. - [Docker Compose] is optional as `docker compose` is supported by modern versions of [Docker] ### For building locally -- [Java] 17, 18, 20 +- [Java] 21, 22 - [Git] - Optionally [Maven] - [Node.js] 18 & npm diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml new file mode 100644 index 00000000..78600fd3 --- /dev/null +++ b/docker-compose.develop.yml @@ -0,0 +1,69 @@ +# +# WARNING: +# This is development version of Docker compose file, it can build the images +# from local files instead of using the published version. +# +# Environment variables: +# * LP_ETL_DOMAIN - URL prefix, for example http://localhost:9080 +# * LP_ETL_PORT - port number to expose LP-ETL on +# * LP_VERSION - 'main' by default or 'develop' +# +# +services: + storage: + image: ghcr.io/linkedpipes/etl-storage:${LP_VERSION-main} + build: + context: . + dockerfile: storage/Dockerfile + volumes: + - data-storage:/data/lp-etl/storage + - configuration:/data/lp-etl/configuration + - data-logs:/data/lp-etl/logs + environment: + - LP_ETL_DOMAIN + restart: always + frontend: + image: ghcr.io/linkedpipes/etl-frontend:${LP_VERSION-main} + build: + context: . + dockerfile: frontend/Dockerfile + volumes: + - configuration:/data/lp-etl/configuration + - data-logs:/data/lp-etl/logs + ports: + - ${LP_ETL_PORT-8080}:8080 + environment: + - LP_ETL_DOMAIN + restart: always + executor-monitor: + image: ghcr.io/linkedpipes/etl-executor-monitor:${LP_VERSION-main} + build: + context: . + dockerfile: executor-monitor/Dockerfile + volumes: + - data-execution:/data/lp-etl/executor + - data-logs:/data/lp-etl/logs + - configuration:/data/lp-etl/configuration + environment: + - LP_ETL_DOMAIN + restart: always + executor: + image: ghcr.io/linkedpipes/etl-executor:${LP_VERSION-main} + build: + context: . + dockerfile: executor/Dockerfile + volumes: + - data-execution:/data/lp-etl/executor + - data-logs:/data/lp-etl/logs + - configuration:/data/lp-etl/configuration + environment: + - LP_ETL_DOMAIN + restart: always +volumes: + data-logs: + data-execution: + data-storage: + configuration: + # When binding configuration it must contain file configuration.properties. + # Do not forget that LP_ETL_DOMAIN overwrites domain.uri in the + # configuration file. diff --git a/docker-compose.yml b/docker-compose.yml index 159157b7..7a9ad881 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ # * LP_ETL_PORT - port number to expose LP-ETL on # * LP_VERSION - 'main' by default or 'develop' # -version: "3" services: storage: image: ghcr.io/linkedpipes/etl-storage:${LP_VERSION-main} diff --git a/pom-backend/pom.xml b/pom-backend/pom.xml index 7ad9dd82..06c9f4dd 100644 --- a/pom-backend/pom.xml +++ b/pom-backend/pom.xml @@ -7,7 +7,7 @@ pom-backend 0.0.0 pom - LinkedPipes Backend Pom + LinkedPipes Backend POM @@ -313,16 +313,6 @@ - - java-17 - - 17 - - - 17 - 17 - - java-21 @@ -375,7 +365,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.3.0 diff --git a/pom-plugin/pom.xml b/pom-plugin/pom.xml index 3565fa8e..73c1ef57 100644 --- a/pom-plugin/pom.xml +++ b/pom-plugin/pom.xml @@ -7,7 +7,7 @@ pom-plugin 0.0.0 pom - LinkedPipes Plugin Pom + LinkedPipes Plugin POM @@ -26,7 +26,7 @@ 4.3.11 4.1.0 5.11.0 - 5.10.2 + 5.10.3 0.0.0 2.16.1 3.10.0 @@ -230,16 +230,6 @@ - - java-17 - - 17 - - - 17 - 17 - - java-21 @@ -293,7 +283,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.3.0 external-dependency