Merge pull request #204 from TouK/missing-bitnami-kafka-fix

Missing bitnami/kafka image fix

Author: arkadius

docker-compose.yml

@@ -166,7 +166,7 @@ services:
   ### KAFKA-related services:
 
   kafka:
-    image: bitnami/kafka:3.7.0
+    image: bitnamilegacy/kafka:3.7.0
     restart: unless-stopped
     hostname: nu-kafka
     environment:
@@ -186,7 +186,7 @@ services:
           memory: 512M
 
   schema-registry:
-    image: bitnami/schema-registry:7.6.1
+    image: bitnamilegacy/schema-registry:7.6.1
     restart: unless-stopped
     environment:
       SCHEMA_REGISTRY_LISTENERS: "http://0.0.0.0:8081"
@@ -236,7 +236,7 @@ services:
     build:
       context: ./flink/
       args:
-        FLINK_VERSION: "1.19.1-scala_2.12-java11"
+        TOUK_FLINK_VERSION: "1.1.4-flink1.20.2-scala_2.12"
       no_cache: true
     restart: unless-stopped
     command: jobmanager
@@ -257,7 +257,7 @@ services:
     build:
       context: ./flink/
       args:
-        FLINK_VERSION: "1.19.1-scala_2.12-java11"
+        TOUK_FLINK_VERSION: "1.1.4-flink1.20.2-scala_2.12"
       no_cache: true
     restart: unless-stopped
     command: taskmanager

flink/Dockerfile

@@ -1,26 +1,17 @@
-ARG FLINK_VERSION="FLINK_VERSION_IS_UNDEFINED"
+ARG TOUK_FLINK_VERSION
 
-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}
+FROM touk/flink:${TOUK_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/
 RUN mkdir -p /opt/flink/data && \
     chmod -R 777 /opt/flink/data
 
-COPY flink-properties.yml /opt/flink/conf/
-
 VOLUME /opt/flink/data
 
 ENTRYPOINT [ "/ex-docker-entrypoint.sh" ]

flink/flink-properties.yml

@@ -8,7 +8,7 @@ jobmanager.memory.jvm-metaspace.size: 500m
 
 state.backend.type: filesystem
 state.checkpoints.dir: file:///opt/flink/data/checkpoints
-state.savepoints.dir: file:///opt/flink/data/savepoints
+execution.checkpointing.savepoint-dir: file:///opt/flink/data/savepoints
 
 #Below are base settings for rocksdb metrics, that can be used for grafana dashboards
 state.backend.rocksdb.metrics.estimate-num-keys: true