Skip to content

Commit 2fcfdf1

Browse files
committed
Fix docker and deps (#3978)
## Proposed Changes - Fix this cargo-audit failure for `sqlite3-sys`: https://github.com/sigp/lighthouse/actions/runs/4179008889/jobs/7238473962 - Prevent the Docker builds from running out of RAM on CI by removing `gnosis` and LMDB support from the `-dev` images (see: #3959 (comment), successful run on my fork: https://github.com/michaelsproul/lighthouse/actions/runs/4179162480/jobs/7239537947).
1 parent 8dd9249 commit 2fcfdf1

File tree

5 files changed

+40
-54
lines changed

5 files changed

+40
-54
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
x86_64-portable]
5454
features: [
5555
{version_suffix: "", env: "gnosis,slasher-lmdb,slasher-mdbx,jemalloc"},
56-
{version_suffix: "-dev", env: "gnosis,slasher-lmdb,slasher-mdbx,jemalloc,spec-minimal"}
56+
{version_suffix: "-dev", env: "jemalloc,spec-minimal"}
5757
]
5858
include:
5959
- profile: maxperf
@@ -65,8 +65,6 @@ jobs:
6565
VERSION: ${{ needs.extract-version.outputs.VERSION }}
6666
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
6767
FEATURE_SUFFIX: ${{ matrix.features.version_suffix }}
68-
FEATURES: ${{ matrix.features.env }}
69-
CROSS_FEATURES: ${{ matrix.features.env }}
7068
steps:
7169
- uses: actions/checkout@v3
7270
- name: Update Rust
@@ -106,7 +104,6 @@ jobs:
106104
--platform=linux/${SHORT_ARCH} \
107105
--file ./Dockerfile.cross . \
108106
--tag ${IMAGE_NAME}:${VERSION}-${SHORT_ARCH}${VERSION_SUFFIX}${MODERNITY_SUFFIX}${FEATURE_SUFFIX} \
109-
--build-arg FEATURES=${FEATURES} \
110107
--provenance=false \
111108
--push
112109
build-docker-multiarch:

Cargo.lock

Lines changed: 34 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

consensus/types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cached_tree_hash = { path = "../cached_tree_hash" }
3737
serde_yaml = "0.8.13"
3838
tempfile = "3.1.0"
3939
derivative = "2.1.1"
40-
rusqlite = { version = "0.25.3", features = ["bundled"], optional = true }
40+
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
4141
arbitrary = { version = "1.0", features = ["derive"], optional = true }
4242
eth2_serde_utils = "0.1.1"
4343
regex = "1.5.5"

validator_client/slashing_protection/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ path = "tests/main.rs"
1212
[dependencies]
1313
tempfile = "3.1.0"
1414
types = { path = "../../consensus/types" }
15-
rusqlite = { version = "0.25.3", features = ["bundled"] }
15+
rusqlite = { version = "0.28.0", features = ["bundled"] }
1616
r2d2 = "0.8.9"
17-
r2d2_sqlite = "0.18.0"
17+
r2d2_sqlite = "0.21.0"
1818
serde = "1.0.116"
1919
serde_derive = "1.0.116"
2020
serde_json = "1.0.58"

validator_client/slashing_protection/src/slashing_database.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ impl SlashingDatabase {
162162
/// The exclusive locking mode also has the benefit of applying to other processes, so multiple
163163
/// Lighthouse processes trying to access the same database will also be blocked.
164164
fn apply_pragmas(conn: &mut rusqlite::Connection) -> Result<(), rusqlite::Error> {
165-
conn.pragma_update(None, "foreign_keys", &true)?;
166-
conn.pragma_update(None, "locking_mode", &"EXCLUSIVE")?;
165+
conn.pragma_update(None, "foreign_keys", true)?;
166+
conn.pragma_update(None, "locking_mode", "EXCLUSIVE")?;
167167
Ok(())
168168
}
169169

0 commit comments

Comments
 (0)