From c4db7d10b32b7acce454fa28dfa759a53fcd394c Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Tue, 14 Jul 2026 22:46:54 +0200 Subject: [PATCH] Add docker image build of logosdeliverynode for CI builds --- .github/workflows/container-image.yml | 11 +++++++++-- Makefile | 4 ++-- ...{logos_delivery_node.nim => logosdeliverynode.nim} | 0 logos_delivery.nimble | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) rename apps/logos_delivery_node/{logos_delivery_node.nim => logosdeliverynode.nim} (100%) diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index 4b0e7dcd2..432858cf5 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -87,19 +87,25 @@ jobs: id: build if: ${{ steps.secrets.outcome == 'success' }} run: | - make -j${NPROC} V=1 POSTGRES=1 NIMFLAGS="-d:disableMarchNative -d:chronicles_colors:none" wakunode2 + make -j${NPROC} V=1 POSTGRES=1 NIMFLAGS="-d:disableMarchNative -d:chronicles_colors:none" wakunode2 logosdeliverynode SHORT_REF=$(git rev-parse --short HEAD) TAG=$([ "${PR_NUMBER}" == "" ] && echo "${SHORT_REF}" || echo "${PR_NUMBER}") IMAGE=quay.io/wakuorg/nwaku-pr:${TAG} + LD_IMAGE=quay.io/wakuorg/nwaku-pr:${TAG}-logosdeliverynode echo "image=${IMAGE}" >> $GITHUB_OUTPUT + echo "ld_image=${LD_IMAGE}" >> $GITHUB_OUTPUT echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT docker login -u ${QUAY_USER} -p ${QUAY_PASSWORD} quay.io docker build -t ${IMAGE} -f docker/binaries/Dockerfile.bn.amd64 --label quay.expires-after=30d . docker push ${IMAGE} + + # logosdeliverynode image (same generic Dockerfile, selected via MAKE_TARGET) + docker build -t ${LD_IMAGE} --build-arg MAKE_TARGET=logosdeliverynode -f docker/binaries/Dockerfile.bn.amd64 --label quay.expires-after=30d . + docker push ${LD_IMAGE} env: QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} QUAY_USER: ${{ secrets.QUAY_USER }} @@ -110,10 +116,11 @@ jobs: if: ${{ github.event_name == 'pull_request' && steps.secrets.outcome == 'success' }} with: message: | - You can find the image built from this PR at + You can find the images built from this PR at ``` ${{steps.build.outputs.image}} + ${{steps.build.outputs.ld_image}} ``` Built from ${{ steps.build.outputs.commit_hash }} diff --git a/Makefile b/Makefile index ad8798138..c7bda841d 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ endif .PHONY: all test clean examples deps nimble install-nim install-nimble # default target -all: | wakunode2 liblogosdelivery +all: | wakunode2 logosdeliverynode liblogosdelivery examples: | example2 chat2 chat2bridge @@ -241,7 +241,7 @@ endif logosdeliverynode: | build-deps build deps librln ifeq ($(detected_OS),Windows) echo -e $(BUILD_MSG) "build/$@" && \ - nim c --out:build/logos_delivery_node --mm:refc --cpu:amd64 $(NIM_PARAMS) -d:chronicles_log_level=TRACE apps/logos_delivery_node/logos_delivery_node.nim + nim c --out:build/logosdeliverynode --mm:refc --cpu:amd64 $(NIM_PARAMS) -d:chronicles_log_level=TRACE apps/logos_delivery_node/logosdeliverynode.nim else echo -e $(BUILD_MSG) "build/$@" && \ $(NIMBLE) logosdeliverynode diff --git a/apps/logos_delivery_node/logos_delivery_node.nim b/apps/logos_delivery_node/logosdeliverynode.nim similarity index 100% rename from apps/logos_delivery_node/logos_delivery_node.nim rename to apps/logos_delivery_node/logosdeliverynode.nim diff --git a/logos_delivery.nimble b/logos_delivery.nimble index 71d2ac079..275bd1a89 100644 --- a/logos_delivery.nimble +++ b/logos_delivery.nimble @@ -389,7 +389,7 @@ task wakunode2, "Build Waku v2 cli node": buildBinary name, "apps/wakunode2/", " -d:chronicles_log_level=TRACE " task logosdeliverynode, "Build Logos Delivery cli node": - let name = "logos_delivery_node" + let name = "logosdeliverynode" buildBinary name, "apps/logos_delivery_node/", " -d:chronicles_log_level=TRACE " task benchmarks, "Some benchmarks":