diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml index 1eb8d8a..10ff53a 100644 --- a/.github/workflows/docker_push.yml +++ b/.github/workflows/docker_push.yml @@ -31,7 +31,7 @@ on: env: REGISTRY: ghcr.io OWNER: ${{ github.repository_owner }} - IMAGE_REPO: flink-docker + IMAGE_REPO: ${{ github.event.repository.name }} jobs: build_and_push: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 02e188a..3463a61 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -16,19 +16,17 @@ name: "Publish SNAPSHOTs" on: - schedule: - - cron: '0 0 * * *' # Deploy every day workflow_dispatch: env: REGISTRY: ghcr.io - OWNER: apache - IMAGE_REPO: flink-docker + OWNER: sn-harishbajaj + IMAGE_REPO: apache.flink-docker jobs: snapshot: # Do not run for forks. - if: github.repository_owner == 'apache' + if: github.repository_owner == 'sn-harishbajaj' runs-on: ubuntu-latest permissions: contents: read diff --git a/1.20/scala_2.12-java11-ubuntu/Dockerfile b/1.20/scala_2.12-java11-ubuntu/Dockerfile index 25c582b..d4a20a9 100644 --- a/1.20/scala_2.12-java11-ubuntu/Dockerfile +++ b/1.20/scala_2.12-java11-ubuntu/Dockerfile @@ -96,6 +96,17 @@ RUN set -ex; \ sed -i '/taskmanager.host: localhost/d' "$CONF_FILE"; \ fi; +# Update log4j to fix CVE-2025-68161 +RUN set -ex; \ + LOG4J_VERSION=2.25.4; \ + find "$FLINK_HOME/lib" -name "log4j-*.jar" -delete; \ + wget -nv -P "$FLINK_HOME/lib" \ + "https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/${LOG4J_VERSION}/log4j-api-${LOG4J_VERSION}.jar" \ + "https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/${LOG4J_VERSION}/log4j-core-${LOG4J_VERSION}.jar" \ + "https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-1.2-api/${LOG4J_VERSION}/log4j-1.2-api-${LOG4J_VERSION}.jar" \ + "https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl/${LOG4J_VERSION}/log4j-slf4j-impl-${LOG4J_VERSION}.jar"; \ + chown flink:flink "$FLINK_HOME/lib"/log4j-*.jar + # Configure container COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"]