Skip to content

Commit

Permalink
Merge branch 'master' into compression-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dkropachev authored Aug 4, 2024
2 parents c1adfdb + fd96fee commit 7bce6f3
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 28 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Vulnerability scan

on:
schedule:
- cron: "44 16 * * *"
push:
pull_request:

jobs:
build:
name: Trivy fs scan
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Run trivy in fs mode
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
scan-ref: '.'
format: 'table'
exit-code: '1'
ignore-unfixed: false
severity: 'CRITICAL,HIGH,MEDIUM'
55 changes: 28 additions & 27 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@

version: "2"
services:
zookeeper:
image: confluentinc/cp-zookeeper:3.2.2
environment:
ZOOKEEPER_CLIENT_PORT: "2181"
zk_id: "1"
ports:
- "2181:2181"
kafka:
hostname: kafka
image: confluentinc/cp-kafka:3.2.2
links:
- zookeeper
ports:
- "9092:9092"
environment:
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://:9092"
schema-registry:
image: confluentinc/cp-schema-registry:3.2.2
links:
- kafka
- zookeeper
ports:
- "8081:8081"
environment:
SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: "zookeeper:2181"
SCHEMA_REGISTRY_HOST_NAME: "schema-registry"
# for future e2e testing
# zookeeper:
# image: confluentinc/cp-zookeeper:3.2.2
# environment:
# ZOOKEEPER_CLIENT_PORT: "2181"
# zk_id: "1"
# ports:
# - "2181:2181"
# kafka:
# hostname: kafka
# image: confluentinc/cp-kafka:3.2.2
# links:
# - zookeeper
# ports:
# - "9092:9092"
# environment:
# KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
# KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://:9092"
# schema-registry:
# image: confluentinc/cp-schema-registry:3.2.2
# links:
# - kafka
# - zookeeper
# ports:
# - "8081:8081"
# environment:
# SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: "zookeeper:2181"
# SCHEMA_REGISTRY_HOST_NAME: "schema-registry"
scylladb:
image: scylladb/scylla
hostname: scylladb/scylla
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>io.kafka.connect</groupId>
<artifactId>kafka-connect-scylladb</artifactId>
<name>kafka-connect-scylladb</name>
<version>1.1.0</version>
<version>1.1.1</version>
<description>A Kafka Connect plugin for Scylla Database</description>
<url>https://github.com/scylla/kafka-connect-scylladb</url>
<inceptionYear>2020</inceptionYear>
Expand Down

0 comments on commit 7bce6f3

Please sign in to comment.