Skip to content

Commit b280474

Browse files
committed
Dockerfiles: fix the remaining warnings and info
Issues Fixed: 1. DL3027 - Replaced apt with apt-get in tools/fuzzing/Dockerfile 2. SC2086 - Added double quotes around $ARCH variable in tools/fuzzing/Dockerfile 3. DL3059 - Consolidated consecutive RUN instructions in tools/fuzzing/Dockerfile 4. SC2174 - Fixed mkdir -p -m by separating into mkdir -p and chmod commands in tools/bootstrap-sandbox/Dockerfile 5. SC3046 - Replaced source with . in node/testing/docker/Dockerfile.test 6. DL3009 - Added missing rm -rf /var/lib/apt/lists/* cleanup in tools/fuzzing/Dockerfile
1 parent 12704b2 commit b280474

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

node/testing/docker/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM vladsimplestakingcom/mina-openmina-builder:focal AS builder
33

44
RUN git fetch && git checkout feat/tests-with-debugger
55

6-
RUN source ~/.cargo/env && cargo +1.84 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing
6+
RUN . ~/.cargo/env && cargo +1.84 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing
77

88
FROM vladsimplestakingcom/mina-debugger:2.0.0rampup4-focal
99

tools/bootstrap-sandbox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM rust:1.84.0-bullseye AS builder
22

3-
RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
3+
RUN mkdir -p ~/.ssh && chmod 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
44

55
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
66

tools/fuzzing/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
FROM debian:bullseye
33

44
# hadolint ignore=DL3008
5-
RUN apt -y update && \
6-
apt -y upgrade && \
7-
apt -y install --no-install-recommends \
5+
RUN apt-get -y update && \
6+
apt-get -y upgrade && \
7+
apt-get -y install --no-install-recommends \
88
apt-transport-https \
99
ca-certificates \
1010
pkg-config \
@@ -34,7 +34,8 @@ RUN apt -y update && \
3434
python3 \
3535
tzdata \
3636
liblmdb-dev \
37-
rsync
37+
rsync && \
38+
rm -rf /var/lib/apt/lists/*
3839

3940
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4041

@@ -49,17 +50,16 @@ RUN ARCH=$(uname -m) && \
4950
echo "Unsupported architecture: $ARCH" && exit 1; \
5051
fi && \
5152
rm -rf /usr/local/go && \
52-
curl -sSL https://go.dev/dl/go1.19.5.linux-$ARCH.tar.gz | tar -C /usr/local -xzf -
53+
curl -sSL https://go.dev/dl/go1.19.5.linux-"$ARCH".tar.gz | tar -C /usr/local -xzf -
5354
RUN export PATH=$PATH:/usr/local/go/bin
5455
RUN curl -sSL https://capnproto.org/capnproto-c++-0.10.2.tar.gz | tar -zxf -
5556
WORKDIR /capnproto-c++-0.10.2
5657
RUN ./configure && \
5758
make -j6 check && \
5859
make install
5960
WORKDIR /
60-
RUN rm -rf capnproto-c++-0.10.2
61-
62-
RUN git clone https://github.com/openmina/mina.git
61+
RUN rm -rf capnproto-c++-0.10.2 && \
62+
git clone https://github.com/openmina/mina.git
6363
WORKDIR /mina
6464
RUN git submodule update --init --recursive && \
6565
git config --local --add submodule.recurse true && \

0 commit comments

Comments
 (0)