From 9eb503657e82037a8095f40b3d2da05d49316854 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Wed, 15 Jan 2025 15:35:04 +0000 Subject: [PATCH] Dockerfile.rlserver: update vissv2server target for VISSR v3 The existing dockerfile originates from VISSR v2 and the vissv2server target has build and runtime issues when built under the current VISSR master branch, e.g. sha 11617fa0, which has transitioned to VISSR v3. See Github issue #77 for details. This commit makes a first pass at bringing the vissv2server target build and runtime up to date for v3. Summary of changes: + protobuf root directory no longer exists. Remove. + vissv2.binary has been replaced by viss.him config file and the binary trees in the forest subdirectory. Copy those. + signaldimension.json has moved location. + introduce VISS json schema and file transfer test file. + fix FROM AS build time warnings related to case mismatches. These changes were successfully sanity tested within the COVESA Central Data Services Playground using the VISSR HTML client to get/set VSS data in the Apache IoTDB database backend. Possible remaining gaps: New features introduced in v3 such as file transfer are untested by the author. Some additional new files may be missing in the list of files copied. This commit has not attempted to address the VISSR AGT Server and Feeder targets. Additional work may be required to support those. Signed-off-by: Stephen Lawrence --- Dockerfile.rlserver | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile.rlserver b/Dockerfile.rlserver index beb141a9..6a2c9103 100644 --- a/Dockerfile.rlserver +++ b/Dockerfile.rlserver @@ -27,7 +27,6 @@ COPY client/ ./client COPY feeder/ ./feeder COPY server/ ./server COPY grpc_pb/ ./grpc_pb -COPY protobuf/ ./protobuf COPY utils ./utils COPY go.mod go.sum ./ @@ -59,7 +58,7 @@ EXPOSE 6379 ENTRYPOINT ["/usr/bin/redis-server", "/etc/redis.conf" ] -FROM golang:latest as vissv2server +FROM golang:latest AS vissv2server USER root RUN mkdir transport_sec WORKDIR /app @@ -70,14 +69,17 @@ COPY --from=builder /build/server/vissv2server/atServer/purposelist.json atServe COPY --from=builder /build/server/vissv2server/atServer/scopelist.json atServer/scopelist.json COPY --from=builder /build/server/vissv2server/uds-registration.docker.json uds-registration.json COPY --from=builder /build/server/vissv2server/iotdb-config.json iotdb-config.json -COPY --from=builder /build/server/vissv2server/vss_vissv2.binary . -COPY --from=builder /build/server/vissv2server/serviceMgr/signaldimension.json . +COPY --from=builder /build/server/vissv2server/signaldimension.json . COPY --from=builder /build/server/agt_server/agt_public_key.rsa . +COPY --from=builder /build/server/vissv2server/viss.him . +COPY --from=builder /build/server/vissv2server/forest forest +COPY --from=builder /build/server/vissv2server/vissv3.0-schema.json . +COPY --from=builder /build/server/vissv2server/upload.txt . ENTRYPOINT ["/app/vissv2server","-s","redis"] -FROM golang:latest as feeder +FROM golang:latest AS feeder USER root WORKDIR /app COPY --from=builder /build/bin/feeder-rl feeder @@ -87,11 +89,11 @@ COPY --from=builder /build/feeder/feeder-rl/VehicleVssMapData.json . ENTRYPOINT ["/app/feeder"] -FROM golang:latest as agt_server +FROM golang:latest AS agt_server USER root RUN mkdir transport_sec WORKDIR /app COPY --from=builder /build/bin/agt_server . COPY --from=builder /build/server/transport_sec/transportSec.json ../transport_sec/transportSec.json COPY --from=builder /build/server/agt_server/agt_public_key.rsa . -COPY --from=builder /build/server/agt_server/agt_private_key.rsa . \ No newline at end of file +COPY --from=builder /build/server/agt_server/agt_private_key.rsa .