jmckenzie-dev commented on code in PR #330: URL: https://github.com/apache/cassandra-sidecar/pull/330#discussion_r3009757245
########## docker/cdc-demo/scripts/cassandra-entrypoint.sh: ########## @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Patches CDC settings into the stock cassandra.yaml and enables remote JMX, +# then hands off to the original Docker entrypoint. +set -e + +YAML="/etc/cassandra/cassandra.yaml" + +patch_yaml() { Review Comment: Would it be worth adding a "didn't find it, couldn't patch" style warning or error here? ########## docker/cdc-demo/Dockerfile.sidecar: ########## @@ -0,0 +1,61 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Two-stage build: Stage 1 compiles via Gradle installDist; Stage 2 copies +# the assembled distribution into a lean JRE image. +# Usage: docker build -f docker/cdc-demo/Dockerfile.sidecar -t cassandra-sidecar:dev . + +# ── Stage 1: build ─────────────────────────────────────────────────────────── +FROM eclipse-temurin:11-jdk-jammy AS builder + +WORKDIR /build + +# Build descriptors first — keeps the dependency-download layer cached separately. +COPY gradlew gradlew +COPY gradle/ gradle/ +COPY gradle.properties settings.gradle build.gradle ./ +COPY adapters/ adapters/ +COPY client/ client/ +COPY client-common/ client-common/ +COPY docs/ docs/ +COPY server-common/ server-common/ +COPY vertx-auth-mtls/ vertx-auth-mtls/ +COPY vertx-client/ vertx-client/ +COPY vertx-client-shaded/ vertx-client-shaded/ +COPY server/ server/ +COPY conf/ conf/ + +# Stage local Maven artifacts so Gradle's mavenLocal() can resolve them. +COPY local-m2/ /root/.m2/repository/ Review Comment: On a naive run this fails: ``` => ERROR [builder 16/17] COPY local-m2/ /root/.m2/repository/ 0.0s ------ > [builder 16/17] COPY local-m2/ /root/.m2/repository/: ------ Dockerfile.sidecar:43 -------------------- 41 | 42 | # Stage local Maven artifacts so Gradle's mavenLocal() can resolve them. 43 | >>> COPY local-m2/ /root/.m2/repository/ 44 | 45 | # Output: build/install/apache-cassandra-sidecar/{bin,lib,agents,conf} -------------------- failed to solve: failed to compute cache key: failed to calculate checksum of ref aad7ec0c-f845-49da-9d54-89dbe1bfba56::j5t3mvgp6jtith5u1g7lwfu1u: "/local-m2": not found ``` I assume it requires me to setup the path it's looking for so it can pull from local m2; we should try and automate this or provide doc guidance on what's required. Assuming I'm not missing something obvious. ########## build.gradle: ########## @@ -195,6 +195,9 @@ startScripts { "-Dsidecar.config=" + confFile, "-Dlogback.configurationFile=" + logbackConfFile, "-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory"] + if (JavaVersion.current().isJava11Compatible()) { Review Comment: What's this change for? ########## docker/cdc-demo/Dockerfile.sidecar: ########## @@ -0,0 +1,61 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Two-stage build: Stage 1 compiles via Gradle installDist; Stage 2 copies +# the assembled distribution into a lean JRE image. +# Usage: docker build -f docker/cdc-demo/Dockerfile.sidecar -t cassandra-sidecar:dev . + +# ── Stage 1: build ─────────────────────────────────────────────────────────── +FROM eclipse-temurin:11-jdk-jammy AS builder + +WORKDIR /build + +# Build descriptors first — keeps the dependency-download layer cached separately. +COPY gradlew gradlew +COPY gradle/ gradle/ +COPY gradle.properties settings.gradle build.gradle ./ +COPY adapters/ adapters/ +COPY client/ client/ +COPY client-common/ client-common/ +COPY docs/ docs/ +COPY server-common/ server-common/ +COPY vertx-auth-mtls/ vertx-auth-mtls/ +COPY vertx-client/ vertx-client/ +COPY vertx-client-shaded/ vertx-client-shaded/ +COPY server/ server/ +COPY conf/ conf/ + +# Stage local Maven artifacts so Gradle's mavenLocal() can resolve them. +COPY local-m2/ /root/.m2/repository/ Review Comment: PR into your branch that fixes this: https://github.com/jyothsnakonisa/cassandra-sidecar/pull/1 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
