Skip to content

Commit

Permalink
#23: Add logger service in order to properly fix biocache hub dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanVanDyck committed Aug 1, 2024
1 parent bdf7d8a commit f69574e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
14 changes: 14 additions & 0 deletions config/logger/logger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
### OIDC Credentials ###
security:
jwt:
clientId: logger
oidc:
clientId: logger
secret: logger-oidc-super-secret
webservice:
client-id: logger
client-secret: xxx

grails:
serverURL: ${common.protocol}://logger.${common.domain}/ws
15 changes: 15 additions & 0 deletions docker/atlas-all/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
# -Dorg.gradle.debug=true -Dorg.gradle.debug.suspend=no --debug \
--parallel

######################################### LOGGER SERVICE #########################################
FROM gradle:7-jdk11 AS logger-service-builder

ARG LOGGER_SERVICE_VERSION=4.3
WORKDIR /project
RUN git clone --branch v${LOGGER_SERVICE_VERSION} --depth 1 https://github.com/AtlasOfLivingAustralia/logger-service.git /project
RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
gradle build assemble --no-daemon \
-x test -x integrationTest \
# -Dorg.gradle.debug=true -Dorg.gradle.debug.suspend=no --debug \
--parallel

######################################### REGIONS #########################################
FROM gradle:7-jdk11 AS regions-builder

Expand Down Expand Up @@ -153,6 +165,7 @@ ARG BIE_INDEX_VERSION=3.1.0
ARG BIOCACHE_HUB_VERSION=7.0.0
ARG BIOCACHE_SERVICE_VERSION=3.4.1
ARG COLLECTORY_VERSION=5.2.0-SNAPSHOT
ARG LOGGER_SERVICE_VERSION=4.3
ARG IMAGE_SERVICE_VERSION=3.0.0
ARG REGIONS_VERSION=4.0.0
ARG SPATIAL_HUB_VERSION=2.1.0
Expand All @@ -169,6 +182,8 @@ COPY --from=biocache-service-builder \
/project/build/libs/biocache-service-${BIOCACHE_SERVICE_VERSION}.war ${CATALINA_HOME}/webapps/biocache-service.war
COPY --from=collectory-builder \
/project/build/libs/collectory-${COLLECTORY_VERSION}-plain.war ${CATALINA_HOME}/webapps/collectory.war
COPY --from=logger-service-builder \
/project/build/libs/logger-service-${IMAGE_SERVICE_VERSION}-plain.war ${CATALINA_HOME}/webapps/logger-service.war
COPY --from=image-service-builder \
/project/build/libs/image-service-${IMAGE_SERVICE_VERSION}-plain.war ${CATALINA_HOME}/webapps/image-service.war
COPY --from=regions-builder \
Expand Down
6 changes: 3 additions & 3 deletions docker/logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM gradle:7-jdk11 AS builder

ARG VERSION=v3.0.3
ARG VERSION=v4.3

WORKDIR /project
RUN git clone --branch ${VERSION} --depth 1 https://github.com/AtlasOfLivingAustralia/logger-service.git /project
Expand All @@ -12,9 +12,9 @@ RUN --mount=type=cache,target=/home/gradle/.gradle/caches \

FROM openjdk:11

ARG VERSION=3.0.3
ARG VERSION=4.3

COPY --from=builder /project/build/libs/logger-service-${VERSION}-exec.war /app.war
COPY --from=builder /project/build/libs/logger-service-${VERSION}.war /app.war

VOLUME /data
ENTRYPOINT ["java", "-jar", "/app.war"]
Expand Down

0 comments on commit f69574e

Please sign in to comment.