diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 95c6d70..969423c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -116,7 +116,12 @@ jobs: echo "Agent version: $AGENT_VERSION" curl -sf -o docker/runtime-base/agent.jar \ "https://gitea.siegeln.net/api/packages/cameleer/maven/com/cameleer3/cameleer3-agent/1.0-SNAPSHOT/cameleer3-agent-${AGENT_VERSION}-shaded.jar" - ls -la docker/runtime-base/agent.jar + APPENDER_VERSION=$(curl -sf "https://gitea.siegeln.net/api/packages/cameleer/maven/com/cameleer3/cameleer3-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/cameleer3-log-appender.jar \ + "https://gitea.siegeln.net/api/packages/cameleer/maven/com/cameleer3/cameleer3-log-appender/1.0-SNAPSHOT/cameleer3-log-appender-${APPENDER_VERSION}.jar" + ls -la docker/runtime-base/agent.jar docker/runtime-base/cameleer3-log-appender.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 f9f6f0b..b9fcf88 100644 --- a/docker/runtime-base/Dockerfile +++ b/docker/runtime-base/Dockerfile @@ -1,9 +1,9 @@ FROM eclipse-temurin:21-jre-alpine WORKDIR /app -# Agent JAR is copied during CI build from Gitea Maven registry -# ARG AGENT_JAR=cameleer3-agent-1.0-SNAPSHOT-shaded.jar +# Agent JAR and log appender JAR are copied during CI build from Gitea Maven registry COPY agent.jar /app/agent.jar +COPY cameleer3-log-appender.jar /app/cameleer3-log-appender.jar ENTRYPOINT exec java \ -Dcameleer.export.type=${CAMELEER_EXPORT_TYPE:-HTTP} \