Build image based on flink

Signed-off-by: Marvin Froeder <marvin@datasqrl.com>

Author: velo

.github/workflows/uber-jar.yml

@@ -20,8 +20,8 @@ jobs:
 
     strategy:
       matrix:
-        SQRL_VERSION: [0.5.6, 0.5.7, 0.5.8, 0.5.9, 0.5.10, 0.6.0-SNAPSHOT]
-        FLINK_PROFILE: [flink1_18, flink1_19, flink1_20]
+        SQRL_VERSION: [0.5.10, 0.6.0-SNAPSHOT]
+        FLINK_PROFILE: [flink-1.19, flink-1.20]
 
     env:
       DOCKER_REPO: datasqrl/flink-jar-runner
@@ -34,16 +34,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Pull base images
-        run: |
-          docker pull alpine:3
-
       - name: Generate settings.xml
         run: |
           mkdir -p ~/.m2
@@ -70,9 +60,16 @@ jobs:
         run: |
           mvn -B clean install -P${{ matrix.FLINK_PROFILE }} -Dsqrl.version=${{ matrix.SQRL_VERSION }}
 
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Build Docker image
+        working-directory: ./target/
         run: |
-          DOCKER_TAG=$DOCKER_REPO:${{ env.VERSION }}-sqrlv${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}
+          DOCKER_TAG=$DOCKER_REPO:${{ env.VERSION }}-sqrl-${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}
           docker build --build-arg SQRL_VERSION=${{ matrix.SQRL_VERSION }} --build-arg RUNNER_VERSION=${{ env.VERSION }} -t $DOCKER_TAG .
           docker push $DOCKER_TAG
 
@@ -82,7 +79,7 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: target/flink-jar-runner.uber.jar
-          asset_name: flink-jar-runner-${{ env.VERSION }}-sqrlv${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
+          asset_name: flink-jar-runner-${{ env.VERSION }}-sqrl-${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
           asset_content_type: application/java-archive
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

@@ -33,6 +33,7 @@
 
   <properties>
     <gcf.skipInstallHooks>true</gcf.skipInstallHooks>
+    <flink-base-image>1.19.1-scala_2.12-java17</flink-base-image>
 
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
@@ -232,6 +233,16 @@
         <directory>src/test/resources</directory>
       </testResource>
     </testResources>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/test/docker</directory>
+        <targetPath>${project.basedir}/target</targetPath>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -424,12 +435,12 @@
 
   <profiles>
     <profile>
-      <id>flink2_0</id>
+      <id>flink-2.0</id>
       <properties>
         <flink.version>2.0-preview1</flink.version>
         <jdbc.version>3.2.0-1.19</jdbc.version>
         <kafka.version>3.2.0-1.19</kafka.version>
-        <test-image-tag>2.0-preview1-scala_2.12-java17</test-image-tag>
+        <flink-base-image>2.0-preview1-scala_2.12-java17</flink-base-image>
       </properties>
 
       <dependencies>
@@ -441,12 +452,12 @@
       </dependencies>
     </profile>
     <profile>
-      <id>flink1_20</id>
+      <id>flink-1.20</id>
       <properties>
         <flink.version>1.20.1</flink.version>
         <jdbc.version>3.2.0-1.19</jdbc.version>
         <kafka.version>3.2.0-1.19</kafka.version>
-        <test-image-tag>1.20.0-scala_2.12-java17</test-image-tag>
+        <flink-base-image>1.20.0-scala_2.12-java17</flink-base-image>
       </properties>
 
       <dependencies>
@@ -458,12 +469,12 @@
       </dependencies>
     </profile>
     <profile>
-      <id>flink1_19</id>
+      <id>flink-1.19</id>
       <properties>
         <flink.version>1.19.2</flink.version>
         <jdbc.version>3.2.0-1.19</jdbc.version>
         <kafka.version>3.2.0-1.19</kafka.version>
-        <test-image-tag>1.19.1-scala_2.12-java11</test-image-tag>
+        <flink-base-image>1.19.1-scala_2.12-java11</flink-base-image>
       </properties>
 
       <dependencies>
@@ -475,18 +486,18 @@
       </dependencies>
     </profile>
     <profile>
-      <id>flink1_18</id>
+      <id>flink-1.18</id>
       <properties>
         <flink.version>1.18.1</flink.version>
         <jdbc.version>3.2.0-1.18</jdbc.version>
         <kafka.version>3.2.0-1.18</kafka.version>
-        <test-image-tag>1.18.1-scala_2.12-java11</test-image-tag>
+        <flink-base-image>1.18.1-scala_2.12-java11</flink-base-image>
       </properties>
 
       <dependencies>
         <dependency>
           <groupId>com.datasqrl</groupId>
-          <artifactId>sqrl-jdbc-1.19</artifactId>
+          <artifactId>sqrl-jdbc-1.18</artifactId>
           <version>${sqrl.version}</version>
         </dependency>
       </dependencies>

Dockerfile renamed to src/test/docker/Dockerfile

@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3
+FROM flink:${flink-base-image}
 
-USER 9999
-
-WORKDIR /runner
-COPY target/flink-jar-runner.uber.jar /runner/
+RUN mkdir -p /opt/flink/plugins/flink-jar-runner
+COPY flink-jar-runner.uber.jar /opt/flink/plugins/flink-jar-runner

src/test/docker/docker-compose.yml

@@ -38,7 +38,7 @@ services:
       - datasqrl_network
 
   jobmanager:
-    image: flink:${test-image-tag}
+    image: flink:${flink-base-image}
     environment:
       - JDBC_URL=jdbc:postgresql://postgres:5432/datasqrl
       - JDBC_USERNAME=postgres
@@ -70,7 +70,7 @@ services:
       - datasqrl_network
 
   taskmanager:
-    image: flink:${test-image-tag}
+    image: flink:${flink-base-image}
     environment:
       - JDBC_URL=jdbc:postgresql://postgres:5432/datasqrl
       - JDBC_USERNAME=postgres