Skip to content

Commit 2fd620c

Browse files
Add docker image build of logosdeliverynode for CI builds
1 parent 5552d14 commit 2fd620c

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/container-image.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,25 @@ jobs:
8787
id: build
8888
if: ${{ steps.secrets.outcome == 'success' }}
8989
run: |
90-
make -j${NPROC} V=1 POSTGRES=1 NIMFLAGS="-d:disableMarchNative -d:chronicles_colors:none" wakunode2
90+
make -j${NPROC} V=1 POSTGRES=1 NIMFLAGS="-d:disableMarchNative -d:chronicles_colors:none" wakunode2 logosdeliverynode
9191
9292
SHORT_REF=$(git rev-parse --short HEAD)
9393
9494
TAG=$([ "${PR_NUMBER}" == "" ] && echo "${SHORT_REF}" || echo "${PR_NUMBER}")
9595
IMAGE=quay.io/wakuorg/nwaku-pr:${TAG}
96+
LD_IMAGE=quay.io/wakuorg/nwaku-pr:${TAG}-logosdeliverynode
9697
9798
echo "image=${IMAGE}" >> $GITHUB_OUTPUT
99+
echo "ld_image=${LD_IMAGE}" >> $GITHUB_OUTPUT
98100
echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
99101
100102
docker login -u ${QUAY_USER} -p ${QUAY_PASSWORD} quay.io
101103
docker build -t ${IMAGE} -f docker/binaries/Dockerfile.bn.amd64 --label quay.expires-after=30d .
102104
docker push ${IMAGE}
105+
106+
# logosdeliverynode image (same generic Dockerfile, selected via MAKE_TARGET)
107+
docker build -t ${LD_IMAGE} --build-arg MAKE_TARGET=logosdeliverynode -f docker/binaries/Dockerfile.bn.amd64 --label quay.expires-after=30d .
108+
docker push ${LD_IMAGE}
103109
env:
104110
QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
105111
QUAY_USER: ${{ secrets.QUAY_USER }}
@@ -110,10 +116,11 @@ jobs:
110116
if: ${{ github.event_name == 'pull_request' && steps.secrets.outcome == 'success' }}
111117
with:
112118
message: |
113-
You can find the image built from this PR at
119+
You can find the images built from this PR at
114120
115121
```
116122
${{steps.build.outputs.image}}
123+
${{steps.build.outputs.ld_image}}
117124
```
118125
119126
Built from ${{ steps.build.outputs.commit_hash }}

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ endif
5454
.PHONY: all test clean examples deps nimble install-nim install-nimble
5555

5656
# default target
57-
all: | wakunode2 liblogosdelivery
57+
all: | wakunode2 logosdeliverynode liblogosdelivery
5858

5959
examples: | example2 chat2 chat2bridge
6060

@@ -241,7 +241,7 @@ endif
241241
logosdeliverynode: | build-deps build deps librln
242242
ifeq ($(detected_OS),Windows)
243243
echo -e $(BUILD_MSG) "build/$@" && \
244-
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
244+
nim c --out:build/logosdeliverynode --mm:refc --cpu:amd64 $(NIM_PARAMS) -d:chronicles_log_level=TRACE apps/logos_delivery_node/logosdeliverynode.nim
245245
else
246246
echo -e $(BUILD_MSG) "build/$@" && \
247247
$(NIMBLE) logosdeliverynode
File renamed without changes.

logos_delivery.nimble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ task wakunode2, "Build Waku v2 cli node":
389389
buildBinary name, "apps/wakunode2/", " -d:chronicles_log_level=TRACE "
390390

391391
task logosdeliverynode, "Build Logos Delivery cli node":
392-
let name = "logos_delivery_node"
392+
let name = "logosdeliverynode"
393393
buildBinary name, "apps/logos_delivery_node/", " -d:chronicles_log_level=TRACE "
394394

395395
task benchmarks, "Some benchmarks":

0 commit comments

Comments
 (0)