From ac0a1abe3467e5700c99023232a8f767bbef89ea Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Fri, 22 Aug 2025 20:28:13 +0200 Subject: [PATCH] latest timezone-service config Signed-off-by: Peter Siegmund --- Dockerfile | 7 +------ Makefile | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile index ddf42c6..7aec945 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -# Stage that builds the application, a prerequisite for the running stage FROM eclipse-temurin:21-jdk-noble AS build RUN apt-get update -qq @@ -28,10 +27,6 @@ USER app COPY --chown=app --from=build /usr/src/app/target/*.jar /usr/app/timezone.jar COPY --chown=app --from=build /usr/src/app/opentelemetry-javaagent.jar /usr/app/opentelemetry-javaagent.jar -ENV JAVA_TOOL_OPTIONS="-javaagent:/usr/app/opentelemetry-javaagent.jar" -ENV OTEL_SERVICE_NAME="timezone-service" -ENV OTEL_EXPORTER_OTLP_ENDPOINT="http://opentelemetry-collector.web:4318" - -HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health/liveness || exit 1 +HEALTHCHECK CMD curl --fail http://localhost:8080/actuator/health || exit 1 CMD ["java", "-jar", "/usr/app/timezone.jar"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a947b67 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +REMOTE_HOST = mars3142@172.16.20.1 +PROJECT_NAME = firmware-hq +SERVICE_NAME = timezone-service +RASPI_PATH = /mnt/data/${PROJECT_NAME} + +install: build deploy import cleanup + +build: + docker buildx build --platform linux/arm64 --no-cache -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -o type=docker,dest=./${SERVICE_NAME}-arm64.tar . + +deploy: + scp ./${SERVICE_NAME}-arm64.tar ${REMOTE_HOST}:${RASPI_PATH}/ + +import: + ssh ${REMOTE_HOST} "sudo docker load -i ${RASPI_PATH}/${SERVICE_NAME}-arm64.tar && rm ${RASPI_PATH}/${SERVICE_NAME}-arm64.tar" + +cleanup: + rm -f ${SERVICE_NAME}-arm64.tar + +.PHONY: build deploy import cleanup