diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index e1ca69d..eb211ce 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - SQRL_VERSION: [0.5.6, 0.5.7, 0.5.8, 0.5.9] + SQRL_VERSION: [v0.5.6, v0.5.7, v0.5.8, v0.5.9, dev] env: DOCKER_REPO: datasqrl/flink-jar-runner @@ -50,7 +50,7 @@ jobs: working-directory: flink-dockerfile-example run: | DOCKER_TAG=$DOCKER_REPO:${{ env.VERSION }}-sqrl${{ matrix.SQRL_VERSION }} - docker build --build-arg SQRL_VERSION=${{ matrix.SQRL_VERSION }} -t $DOCKER_TAG . + docker build --build-arg SQRL_VERSION=${{ matrix.SQRL_VERSION }} --build-arg GITHUB_ACTOR=${{ github.actor }} --build-arg GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} -t $DOCKER_TAG . - name: Push Docker image if: github.event_name == 'release' && github.event.action == 'created' diff --git a/flink-dockerfile-example/Dockerfile b/flink-dockerfile-example/Dockerfile index e00bfa6..b8a2ae0 100644 --- a/flink-dockerfile-example/Dockerfile +++ b/flink-dockerfile-example/Dockerfile @@ -16,7 +16,12 @@ FROM gradle:8.6-jdk11 AS build -ARG SQRL_VERSION="0.5.7" +ARG SQRL_VERSION="v0.5.7" +ARG GITHUB_ACTOR +ARG GITHUB_TOKEN + +ENV GITHUB_ACTOR=${GITHUB_ACTOR} +ENV GITHUB_TOKEN=${GITHUB_TOKEN} WORKDIR /app diff --git a/flink-dockerfile-example/build.gradle b/flink-dockerfile-example/build.gradle index faf3ad6..901a427 100644 --- a/flink-dockerfile-example/build.gradle +++ b/flink-dockerfile-example/build.gradle @@ -27,8 +27,13 @@ ext { flinkVersion = "1.19.1" jdbcVersion = "3.2.0-1.19" kafkaVersion = "3.2.0-1.19" - sqrlVersion = System.getenv('SQRL_VERSION') icebergVersion = "1.6.0" + sqrlVersion = System.getenv('SQRL_VERSION')?.replaceFirst('^v', '') ?: 'dev' +} + +// Logic to fetch the latest snapshot version if sqrlVersion is 'dev' +if (sqrlVersion == 'dev') { + sqrlVersion = '0.5.10-SNAPSHOT' } repositories { @@ -37,6 +42,13 @@ repositories { maven { url "https://packages.confluent.io/maven/" } + maven { + url "https://maven.pkg.github.com/DataSQRL/sqrl" + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } } dependencies {