Skip to content
This repository was archived by the owner on May 29, 2026. It is now read-only.

chore!: Using the conventional app script generated by gradle instead… #482

Open
Filter94 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore!: Using the conventional app script generated by gradle instead… #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d64cdc
chore!: Using the conventional app script generated by gradle instead…
Filter94 Dec 5, 2025
ecba679
Returning back useful java options
Filter94 Dec 5, 2025
737cb5d
Fixing the charts for the new image
Filter94 Dec 5, 2025
1f4b0ab
Fixing the charts for the new image
Filter94 Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/maru-build-and-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ jobs:
with:
context: app
build-contexts: |
libs=./app/build/install/app/lib/
maru=./app/build/libs/
app=./app/build/install/app/
platforms: linux/amd64
load: true
push: false
Expand All @@ -147,8 +146,7 @@ jobs:
with:
context: app
build-contexts: |
libs=./app/build/install/app/lib/
maru=./app/build/libs/
app=./app/build/install/app/
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ env.TAGS }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ clean:

docker-build-local-image:
./gradlew :app:installDist
docker build app --build-context=libs=./app/build/install/app/lib/ -t consensys/maru:local
docker build app --build-context=app=./app/build/install/app/ -t consensys/maru:local

docker-run-stack:
CREATE_EMPTY_BLOCKS=true $(if $(MARU_TAG),MARU_TAG=$(MARU_TAG)) docker compose -f docker/compose.yaml -f docker/compose.dev.yaml up -d
Expand Down
4 changes: 3 additions & 1 deletion app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre-noble

WORKDIR /opt/consensys/maru

COPY --from=libs ./** ./
COPY --from=app . .

# Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE
Expand All @@ -18,3 +18,5 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="ConsenSys" \
org.label-schema.version=$VERSION \
org.label-schema.schema-version="1.0"

ENTRYPOINT ["/opt/consensys/maru/bin/app"]
2 changes: 1 addition & 1 deletion chaos-testing/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ helm-redeploy-linea:
build-maru-image:
@echo "Building Maru image"
cd .. && ./gradlew :app:installDist
cd .. && docker build app --build-context=libs=./app/build/install/app/lib/ -t consensys/maru:local
cd .. && docker build app --build-context=app=./app/build/install/app/ -t consensys/maru:local

build-and-import-maru-image:
@$(MAKE) build-maru-image
Expand Down
6 changes: 1 addition & 5 deletions chaos-testing/helm/charts/maru/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ spec:
{{- with .Values.env }}
{{- toYaml . | nindent 12 }}
{{- end }}

command:
- java
- -Dlog4j2.configurationFile=configs/log4j.xml
- -jar
- maru.jar
- /opt/consensys/maru/bin/app
- --maru-genesis-file
- /opt/consensys/maru/configs/genesis.json
- --config
Expand Down
3 changes: 3 additions & 0 deletions chaos-testing/helm/charts/maru/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ probes:
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
env:
- name: JAVA_OPTS
value: "-Dlog4j2.configurationFile=configs/log4j.xml"

configFiles:
privateKey: |
Expand Down
13 changes: 6 additions & 7 deletions docker/compose.dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ name: maru
services:

maru:
# make build-local-image
# make docker-build-local-image
# MARU_TAG=local make docker-run-stack
image: consensys/maru:${MARU_TAG:-dbb6c73}
container_name: maru
depends_on:
- sequencer
- follower-geth
command: [ 'java',
# '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
# '-Dvertx.configurationFile=/opt/consensys/maru/configs/vertx-options.json',
'-Dlog4j2.configurationFile=configs/log4j.xml',
'-jar', "maru.jar",
'--maru-genesis-file', 'configs/genesis.json',
environment:
# '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
# '-Dvertx.configurationFile=/opt/consensys/maru/configs/vertx-options.json',
JAVA_OPTS: '-Dlog4j2.configurationFile=configs/log4j.xml'
command: [ '--maru-genesis-file', 'configs/genesis.json',

@jonesho jonesho Dec 9, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a reminder, we'd need to update this to the maru container in linea-monorepo local stack

@Filter94 Filter94 Dec 9, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Everywhere really

'--config', 'configs/config.dev.toml' ]
volumes:
- ./maru/config.dev.toml:/opt/consensys/maru/configs/config.dev.toml:ro
Expand Down