Skip to content

Commit fc11393

Browse files
fix(docker): bump submodules and images, fix zaino start command (#29)
- Bump Zebra to v4.3.0 - Bump Zaino to zingolabs/zaino@dev (0.2.0, Zebra 4.3.0 compatible) - Bump Zallet to zcash/wallet@main - Fix zaino command: add missing `start` subcommand (fixes #28) - Rebuild zaino CI image (sha-83e41d7) Closes #28
1 parent 83e41d7 commit fc11393

6 files changed

Lines changed: 13 additions & 10 deletions

File tree

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
# =============================================================================
3232
# Image Overrides (defaults are pinned versions in docker-compose.yml)
3333
# =============================================================================
34-
# ZEBRA_IMAGE=zfnd/zebra:4.2.0
35-
# ZAINO_IMAGE=ghcr.io/zcashfoundation/zaino:sha-0164cab
34+
# ZEBRA_IMAGE=zfnd/zebra:4.3.0
35+
# ZAINO_IMAGE=ghcr.io/zcashfoundation/zaino:sha-83e41d7
3636
# ZALLET_IMAGE=electriccoinco/zallet:v0.1.0-alpha.3
3737
# ZEBRA_BUILD_FEATURES=default-release-binaries
3838

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ All images can be overridden via environment variables (`ZEBRA_IMAGE`, `ZAINO_IM
126126

127127
| Service | Default Image | Source |
128128
|---------|---------------|--------|
129-
| Zebra | `zfnd/zebra:4.2.0` | [ZcashFoundation/zebra](https://github.com/ZcashFoundation/zebra) |
130-
| Zaino | `ghcr.io/zcashfoundation/zaino:sha-0164cab` | [zingolabs/zaino](https://github.com/zingolabs/zaino) |
129+
| Zebra | `zfnd/zebra:4.3.0` | [ZcashFoundation/zebra](https://github.com/ZcashFoundation/zebra) |
130+
| Zaino | `ghcr.io/zcashfoundation/zaino:sha-83e41d7` | [zingolabs/zaino](https://github.com/zingolabs/zaino) |
131131
| Zallet | `electriccoinco/zallet:v0.1.0-alpha.3` | [zcash/wallet](https://github.com/zcash/wallet) |
132132

133133
## Prerequisites

docker-compose.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ x-common: &common
1414

1515
services:
1616
zebra:
17-
image: ${ZEBRA_IMAGE:-zfnd/zebra:4.2.0}
17+
image: ${ZEBRA_IMAGE:-zfnd/zebra:4.3.0}
1818
platform: ${DOCKER_PLATFORM:-linux/amd64}
1919
build:
2020
context: ./zebra
@@ -64,7 +64,10 @@ services:
6464
start_interval: 5s
6565

6666
zaino:
67-
image: ${ZAINO_IMAGE:-ghcr.io/zcashfoundation/zaino:sha-0164cab}
67+
# Image built by z3 CI from zingolabs/zaino@dev branch.
68+
# The sha-* tag is a z3 commit hash, not a zaino one.
69+
# Upstream: https://github.com/zingolabs/zaino (zainod 0.2.0 / Zebra 4.3.0 compatible)
70+
image: ${ZAINO_IMAGE:-ghcr.io/zcashfoundation/zaino:sha-83e41d7}
6871
platform: ${DOCKER_PLATFORM:-linux/amd64}
6972
build:
7073
context: ./zaino
@@ -76,7 +79,7 @@ services:
7679
# Zaino's entrypoint runs mkdir/chown before dropping privileges via setpriv.
7780
# These operations need capabilities that cap_drop: [ALL] removes, so we add them back.
7881
cap_add: [CHOWN, DAC_OVERRIDE, FOWNER, SETUID, SETGID]
79-
command: ["--config", "/etc/zaino/zindexer.toml"]
82+
command: ["start", "--config", "/etc/zaino/zindexer.toml"]
8083
depends_on:
8184
zebra:
8285
condition: service_healthy

zallet

0 commit comments

Comments
 (0)