fix (#188)

Co-authored-by: Mateusz Kołodziejczyk <[email protected]>

docker-compose.yml

@@ -7,6 +7,7 @@ services:
     build:
       context: quickstart-setup/
       dockerfile: Dockerfile
+      no_cache: true
     depends_on:
       nginx:
         condition: service_healthy
@@ -222,6 +223,7 @@ services:
       context: ./flink/
       args:
         FLINK_VERSION: "1.18.1-scala_2.12-java11"
+      no_cache: true
     restart: unless-stopped
     command: jobmanager
     environment:
@@ -238,6 +240,7 @@ services:
       context: ./flink/
       args:
         FLINK_VERSION: "1.18.1-scala_2.12-java11"
+      no_cache: true
     restart: unless-stopped
     command: taskmanager
     environment:

flink/Dockerfile

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ARG FLINK_VERSION="FLINK_VERSION_IS_UNDEFINED"
 
 FROM curlimages/curl:8.9.1 AS lib_provider
@@ -7,9 +6,6 @@ FROM curlimages/curl:8.9.1 AS lib_provider
 # 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
-=======
-ARG FLINK_VERSION=undefined-flink-version
->>>>>>> origin/main
 
 FROM flink:${FLINK_VERSION}