diff --git a/Dockerfile b/Dockerfile index be16d85..0026264 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,6 @@ USER app COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/config.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="config-service" -ENV OTEL_EXPORTER_OTLP_ENDPOINT="http://opentelemetry-collector.web:4318" - -HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health || exit 1 +HEALTHCHECK CMD curl --fail http://localhost:8888/actuator/health || exit 1 CMD ["java", "-jar", "/usr/app/config.jar"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ecf9d16 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +REMOTE_HOST = mars3142@172.16.20.1 +PROJECT_NAME = firmware-hq +SERVICE_NAME = config-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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 416db15..d9f430f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,9 +17,7 @@ spring: native: search-locations: classpath:/configurations git: - uri: https://github.com/${GIT_USER}/remote-config.git - username: ${GIT_USER} - password: ${GIT_TOKEN} + uri: https://${GIT_LOGIN_USER}:${GIT_TOKEN}@${GIT_USER}/${GIT_REPO}/remote-config.git default-label: main profiles: active: native