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) <noreply@anthropic.com>
This commit is contained in:
@@ -116,12 +116,7 @@ jobs:
|
|||||||
echo "Agent version: $AGENT_VERSION"
|
echo "Agent version: $AGENT_VERSION"
|
||||||
curl -sf -o docker/runtime-base/agent.jar \
|
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"
|
"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" \
|
ls -la docker/runtime-base/agent.jar
|
||||||
| sed -n 's/.*<value>\([^<]*\)<\/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
|
|
||||||
TAGS="-t gitea.siegeln.net/cameleer/cameleer-runtime-base:${{ github.sha }}"
|
TAGS="-t gitea.siegeln.net/cameleer/cameleer-runtime-base:${{ github.sha }}"
|
||||||
for TAG in $IMAGE_TAGS; do
|
for TAG in $IMAGE_TAGS; do
|
||||||
TAGS="$TAGS -t gitea.siegeln.net/cameleer/cameleer-runtime-base:$TAG"
|
TAGS="$TAGS -t gitea.siegeln.net/cameleer/cameleer-runtime-base:$TAG"
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ FROM bellsoft/liberica-runtime-container:jre-21-slim-glibc
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Agent + log appender are baked in; tenant JAR is delivered at deploy
|
# Agent is baked in; log appender is embedded in cameleer-core.
|
||||||
# time by cameleer-runtime-loader into the RO-mounted /app/jars volume.
|
# 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 agent.jar /app/agent.jar
|
||||||
COPY cameleer-log-appender.jar /app/cameleer-log-appender.jar
|
|
||||||
|
|
||||||
# No ENTRYPOINT here. cameleer-server's DeploymentExecutor builds the
|
# No ENTRYPOINT here. cameleer-server's DeploymentExecutor builds the
|
||||||
# per-runtime-type entrypoint (spring-boot/quarkus: -jar; plain-java:
|
# per-runtime-type entrypoint (spring-boot/quarkus: -jar; plain-java:
|
||||||
|
|||||||
Reference in New Issue
Block a user