Skip to content

Commit bfd6f2f

Browse files
flowftwM4rc0Russ0Kammerlo
authored
Chore/merge main (#286)
* Fix/erased sum applied using account values (#252) * fix: publisher unlock transactions (#236) * fix: publisher unlock transactions * fix: set strategy back to immediate and will publish it after 5min * chore: update docker * chore: update docker * chore: update docker * Update Dockerfile * fix: journal enrichment (#240) * Update Dockerfile * Update Dockerfile * Update Dockerfile * chore: update docker * chore: updating docker * chore: updating docker * chore: increasing the poolsize to 50 * chore: upgrading docker version * chore: increase maximum pool-size * Fix/cant create new db transactions (#241) * chore: updating docker image * chore: increase pool size * chore: updating docker * chore: decreasing max pool size * chore: updating docker * chore: update docker * chore: update docker * fix: missing_currecny_data_should_result_invalid_tx (#242) Co-authored-by: Kammerlo <thomas.kammerlocher@cardanofoundation.org> * Update Dockerfile * chore: update docker * Fix: CARDANO_MAX_TRANSACTION_SIZE_BYTES (#244) * fix: extraction endpoint and public interface (#246) * fix: public interface (#247) * Dockerfile (#249) * fix: account credit name (#250) --------- Co-authored-by: Thomas Kammerlocher <thomas.kammerlocher@cardanofoundation.org> * Revert "Fix/erased sum applied using account values (#252)" (#254) This reverts commit 74637a6. * Revert "Fix/erased sum applied using account values (#252)" (#255) This reverts commit 74637a6. * Revert "chore: updating dockerfile to contain the latest security fixes (#235)" (#256) This reverts commit 6d75c23. * fix: kafka version * Release/1.0.0 (#238) * fix: publisher unlock transactions (#236) * fix: publisher unlock transactions * fix: set strategy back to immediate and will publish it after 5min * chore: update docker * chore: update docker * chore: update docker * Update Dockerfile * fix: journal enrichment (#240) * Update Dockerfile * Update Dockerfile * Update Dockerfile * chore: update docker * chore: updating docker * chore: updating docker * chore: increasing the poolsize to 50 * chore: upgrading docker version * chore: increase maximum pool-size * Fix/cant create new db transactions (#241) * chore: updating docker image * chore: increase pool size * chore: updating docker * chore: decreasing max pool size * chore: updating docker * chore: update docker * chore: update docker * fix: missing_currecny_data_should_result_invalid_tx (#242) Co-authored-by: Kammerlo <thomas.kammerlocher@cardanofoundation.org> * Update Dockerfile * chore: update docker * Fix: CARDANO_MAX_TRANSACTION_SIZE_BYTES (#244) * fix: extraction endpoint and public interface (#246) * fix: public interface (#247) * Dockerfile (#249) * fix: account credit name (#250) * fix: tcitem group strategy (#257) * Update Dockerfile * Update Dockerfile (#261) * Update Dockerfile * Adding aggregation on publisher feature (#263) * Update Dockerfile * Update Dockerfile * Update Dockerfile * fix: change_long_to_bigdecimal_public_and_publisher (#264) * Update Dockerfile * sdsd (#265) * Chore/add healtchecks to docker compose (#275) * chore: adding health checks for api and keycloak * chore: adding health checks for api and keycloak * fix: replacing latest to fixed kafka version to avoid version incompatibilities (#276) * Update build.gradle.kts * Update Dockerfile --------- Co-authored-by: Marco Russo <108673166+M4rc0Russ0@users.noreply.github.com> * release 1.0.1 (#281) * Update Dockerfile * Update Dockerfile (#282) * Update Dockerfile * Update Dockerfile * chore(earthly): use filtered registries (#283) * chore(earthly): use filtered registries * chore(gradle): set version to 1.0.1 * chore(earthly): docker registries test * chore(earthly): back to using DOCKER_REGISTRIES * chore(earthly): revert push condition * chore(workflows): use ref main for cf-gha-workflows --------- Co-authored-by: Marco Russo <108673166+M4rc0Russ0@users.noreply.github.com> Co-authored-by: Thomas Kammerlocher <thomas.kammerlocher@cardanofoundation.org> Co-authored-by: Marco Russo <marco.russo@cardanofoundation.org>
1 parent 2cd4407 commit bfd6f2f

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ jobs:
5555
run: |
5656
earthly +docker-publish \
5757
--PUSH=${DOCKER_PUSH} \
58-
--DOCKER_REGISTRIES="${{ secrets.DOCKER_REGISTRIES }}" \
58+
--DOCKER_REGISTRIES="${{ env.DOCKER_REGISTRIES_FILTERED }}" \
5959
--DOCKER_IMAGES_EXTRA_TAGS="${EARTHLY_DOCKER_IMAGES_EXTRA_TAGS}"
6060
61-
6261
- name: Set event dispatch type
6362
id: set-event-dispatch-type
6463
if: steps.cf-gha-baseline.outputs.TRIGGERING_REF == 'tag'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG LIB_DOCKER_IMAGE=pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/cf-reeve-platform-library-m2-cache:release-1.1.0-ab90738-GHRUN16342303420
1+
ARG LIB_DOCKER_IMAGE=ghcr.io/cardano-foundation/cf-reeve-platform-library-m2-cache:release-1.1.0-ab90738-GHRUN16342303420
22
FROM ${LIB_DOCKER_IMAGE} AS m2-cache
33

44
FROM openjdk:21-jdk-slim AS build

‎Earthfile‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ ARG --global ALL_BUILD_TARGETS="backend"
44

55
ARG --global DOCKER_IMAGE_PREFIX="cf-reeve"
66
ARG --global DOCKER_IMAGES_EXTRA_TAGS=""
7-
ARG --global DOCKER_REGISTRIES="hub.docker.com"
8-
ARG --global HUB_DOCKER_COM_ORG=cardanofoundation
7+
ARG --global DOCKER_REGISTRIES="docker.io/cardanofoundation"
98
ARG --global PUSH=false
109

1110
all:
@@ -28,22 +27,14 @@ docker-publish:
2827
SET IMAGE_NAME = ${DOCKER_IMAGE_PREFIX}-${image_target}
2928
IF [ ! -z "$DOCKER_IMAGES_EXTRA_TAGS" ]
3029
FOR image_tag IN $DOCKER_IMAGES_EXTRA_TAGS
31-
IF [ "$registry" = "hub.docker.com" ]
32-
RUN docker tag ${IMAGE_NAME}:latest ${HUB_DOCKER_COM_ORG}/${IMAGE_NAME}:${image_tag}
33-
RUN if [ "$PUSH" = "true" ]; then docker push ${HUB_DOCKER_COM_ORG}/${IMAGE_NAME}:${image_tag}; fi
34-
ELSE
35-
RUN docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${image_tag}
36-
RUN if [ "$PUSH" = "true" ]; then docker push ${registry}/${IMAGE_NAME}:${image_tag}; fi
37-
END
30+
RUN echo docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${image_tag} && \
31+
docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${image_tag}
32+
RUN if [ "$PUSH" = "true" ]; then docker push ${registry}/${IMAGE_NAME}:${image_tag}; fi
3833
END
3934
END
40-
IF [ "$registry" = "hub.docker.com" ]
41-
RUN docker tag ${IMAGE_NAME}:latest ${HUB_DOCKER_COM_ORG}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}
42-
RUN if [ "$PUSH" = "true" ]; then docker push ${HUB_DOCKER_COM_ORG}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}; fi
43-
ELSE
44-
RUN docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}
45-
RUN if [ "$PUSH" = "true" ]; then docker push ${registry}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}; fi
46-
END
35+
RUN echo docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH} && \
36+
docker tag ${IMAGE_NAME}:latest ${registry}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}
37+
RUN if [ "$PUSH" = "true" ]; then docker push ${registry}/${IMAGE_NAME}:${EARTHLY_GIT_SHORT_HASH}; fi
4738
END
4839
END
4940

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subprojects {
1616
apply(plugin = "info.solidsoft.pitest")
1717

1818
group = "de.cardanofoundation"
19-
version = "0.0.1-SNAPSHOT"
19+
version = "1.1.0-SNAPSHOT"
2020

2121
sourceSets {
2222
named("main") {

‎docker-compose.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ services:
113113
LOB_SECURITY_CLAMAV_PORT: 3310
114114
working_dir: /app
115115
entrypoint: ${ENTRYPOINT:-java --enable-preview -jar /app.jar}
116+
healthcheck:
117+
test: ["CMD-SHELL", "bash -c 'echo > /dev/tcp/localhost/9000'"]
118+
interval: 30s
119+
timeout: 10s
120+
retries: 5
121+
start_period: 20s
116122
networks:
117123
- lob
118124
ports:
@@ -170,6 +176,12 @@ services:
170176
KC_DB_URL_PORT: ${KC_DB_URL_PORT:-5432}
171177
KC_DB_USERNAME: ${KC_DB_USERNAME:-postgres}
172178
KC_DB_PASSWORD: ${KC_DB_PASSWORD:-postgres}
179+
healthcheck:
180+
test: ["CMD-SHELL", "bash -c 'echo > /dev/tcp/localhost/8080'"]
181+
interval: 30s
182+
timeout: 10s
183+
retries: 5
184+
start_period: 20s
173185
ports:
174186
- ${EXPOSED_KC_HTTP_PORT:-8080}:${KC_HTTP_PORT:-8080}
175187
- ${EXPOSED_KC_HTTPS_PORT:-8443}:${KC_HTTPS_PORT:-8443}

0 commit comments

Comments
 (0)