Merge pull request #193 from TouK/staging

Nu 1.17.0

.env

@@ -1 +1 @@
-NUSSKNACKER_VERSION=1.16.3
+NUSSKNACKER_VERSION=1.17.0

docker-compose.yml

@@ -4,16 +4,28 @@ services:
 
   ### Quickstart setup container 
   quickstart-setup:
-    build:
-      context: quickstart-setup/
-      dockerfile: Dockerfile
+    image: touk/nussknacker-example-scenarios-library:latest
     depends_on:
       nginx:
         condition: service_healthy
+      designer:
+        condition: service_healthy
+      kafka:
+        condition: service_healthy
+      schema-registry:
+        condition: service_healthy
+    environment:
+      NU_DESIGNER_ADDRESS: "nginx:8080"
+      NU_REQUEST_RESPONSE_OPEN_API_SERVICE_ADDRESS: "nginx:8181"
+      KAFKA_ADDRESS: "kafka:9092"
+      SCHEMA_REGISTRY_ADDRESS: "schema-registry:8081"
+    volumes:
+      - nussknacker_designer_shared_configuration:/opt/nussknacker/conf/
     deploy:
       resources:
         limits:
-          memory: 128M
+          memory: 256M
+          cpus: '0.5'
 
   ### Nussknacker-related services
 
@@ -46,7 +58,8 @@ services:
     image: touk/nussknacker:${NUSSKNACKER_VERSION:?NUSSKNACKER_VERSION must be defined}_scala-2.12
     restart: unless-stopped
     environment:
-      CONFIG_FILE: "/opt/nussknacker/conf/application.conf,/opt/nussknacker/conf/application-customizations.conf"
+      EXAMPLE_SCENARIOS_LIBRARY_SERVICE_NAME: quickstart-setup
+      CONFIG_FILE: "/opt/nussknacker/conf/application.conf,/opt/nussknacker/conf/additional-configuration.conf,/opt/nussknacker/conf/application-customizations.conf"
       DB_URL: "jdbc:postgresql://postgres:5432/nu-db"
       DB_DRIVER: "org.postgresql.Driver"
       DB_USER: "nu"
@@ -71,13 +84,14 @@ services:
         condition: service_healthy
       flink-taskmanager:
         condition: service_started
-    expose: 
+    expose:
       - 8181
     healthcheck:
       test: [ "CMD-SHELL", "curl localhost:8080/api/app/healthCheck" ]
       interval: 10s
       retries: 10
     volumes:
+      - nussknacker_designer_shared_configuration:/opt/nussknacker/conf
       - ./designer/application-customizations.conf:/opt/nussknacker/conf/application-customizations.conf
     volumes_from:
       - flink-jobmanager
@@ -216,6 +230,7 @@ services:
       context: ./flink/
       args:
         FLINK_VERSION: "1.18.1-scala_2.12-java11"
+      no_cache: true
     restart: unless-stopped
     command: jobmanager
     environment:
@@ -232,6 +247,7 @@ services:
       context: ./flink/
       args:
         FLINK_VERSION: "1.18.1-scala_2.12-java11"
+      no_cache: true
     restart: unless-stopped
     command: taskmanager
     environment:
@@ -265,5 +281,7 @@ services:
 volumes:
   nussknacker_designer_data:
     name: nussknacker_designer_data
+  nussknacker_designer_shared_configuration:
+    name: nussknacker_designer_shared_configuration
   nussknacker_flink_data:
     name: nussknacker_flink_data

flink/Dockerfile

@@ -1,11 +1,19 @@
-ARG FLINK_VERSION=undefined-flink-version
+ARG FLINK_VERSION="FLINK_VERSION_IS_UNDEFINED"
+
+FROM curlimages/curl:8.9.1 AS lib_provider
+
+# Adding custom libraries ('add other libraries' section):
+# https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/standalone/docker/#further-customization
+WORKDIR /libs
+RUN curl -k --output /libs/postgresql-42.6.0.jar https://repo1.maven.org/maven2/org/postgresql/postgresql/42.6.0/postgresql-42.6.0.jar
 
 FROM flink:${FLINK_VERSION}
 
 USER root
 RUN echo '#!/bin/sh' > /ex-docker-entrypoint.sh && \
     echo 'export FLINK_PROPERTIES=$(cat /opt/flink/conf/flink-properties.yml) && /docker-entrypoint.sh "$@"' >> /ex-docker-entrypoint.sh && \
     chmod +x /ex-docker-entrypoint.sh
+COPY --from=lib_provider /libs/ /opt/flink/lib/
 
 USER flink
 COPY flink-properties.yml /opt/flink/conf/