From 61fc7f224f08d845b9df6e6d381ca2fa527e118b Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Tue, 28 Apr 2026 18:56:29 +0200 Subject: [PATCH] fix(ci): remove log-appender from runtime base image The log appender is now embedded in cameleer-core, so it no longer needs to be downloaded separately and baked into the runtime base image. Removes the Maven download step and the Dockerfile COPY. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/ci.yml | 7 +------ docker/runtime-base/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 82abb74..fc3595f 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -116,12 +116,7 @@ jobs: echo "Agent version: $AGENT_VERSION" curl -sf -o docker/runtime-base/agent.jar \ "https://gitea.siegeln.net/api/packages/cameleer/maven/io/cameleer/cameleer-agent/1.0-SNAPSHOT/cameleer-agent-${AGENT_VERSION}-shaded.jar" - APPENDER_VERSION=$(curl -sf "https://gitea.siegeln.net/api/packages/cameleer/maven/io/cameleer/cameleer-log-appender/1.0-SNAPSHOT/maven-metadata.xml" \ - | sed -n 's/.*\([^<]*\)<\/value>.*/\1/p' | tail -1) - echo "Log appender version: $APPENDER_VERSION" - curl -sf -o docker/runtime-base/cameleer-log-appender.jar \ - "https://gitea.siegeln.net/api/packages/cameleer/maven/io/cameleer/cameleer-log-appender/1.0-SNAPSHOT/cameleer-log-appender-${APPENDER_VERSION}.jar" - ls -la docker/runtime-base/agent.jar docker/runtime-base/cameleer-log-appender.jar + ls -la docker/runtime-base/agent.jar TAGS="-t gitea.siegeln.net/cameleer/cameleer-runtime-base:${{ github.sha }}" for TAG in $IMAGE_TAGS; do TAGS="$TAGS -t gitea.siegeln.net/cameleer/cameleer-runtime-base:$TAG" diff --git a/docker/runtime-base/Dockerfile b/docker/runtime-base/Dockerfile index ca75e8f..a1d51c0 100644 --- a/docker/runtime-base/Dockerfile +++ b/docker/runtime-base/Dockerfile @@ -4,10 +4,10 @@ FROM bellsoft/liberica-runtime-container:jre-21-slim-glibc WORKDIR /app -# Agent + log appender are baked in; tenant JAR is delivered at deploy -# time by cameleer-runtime-loader into the RO-mounted /app/jars volume. +# Agent is baked in; log appender is embedded in cameleer-core. +# Tenant JAR is delivered at deploy time by cameleer-runtime-loader +# into the RO-mounted /app/jars volume. COPY agent.jar /app/agent.jar -COPY cameleer-log-appender.jar /app/cameleer-log-appender.jar # No ENTRYPOINT here. cameleer-server's DeploymentExecutor builds the # per-runtime-type entrypoint (spring-boot/quarkus: -jar; plain-java: