Skip to content

Commit edfe8e8

Browse files
committed
ci: fix some dockerfile issues after linter
Signed-off-by: Boris Glimcher <[email protected]>
1 parent be9b120 commit edfe8e8

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

.github/workflows/markdown.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ jobs:
2727
- uses: hadolint/[email protected]
2828
with:
2929
recursive: true
30+
ignore: DL3041

integration/host-cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
FROM fedora:36
22

3-
RUN dnf install -y fio nvme-cli nmap tftp
3+
RUN dnf install -y fio nvme-cli nmap tftp && dnf clean all

integration/pxe/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
FROM fedora:36
2-
RUN dnf install -y dhcp-server tftp-server tftp gettext syslinux net-tools nmap
2+
RUN dnf install -y dhcp-server tftp-server tftp gettext syslinux net-tools nmap && dnf clean all

integration/pxe/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ docker-compose -f docker-compose.pxe.yml up --build
2525

2626
```text
2727
docker-compose -f docker-compose.pxe.yml exec pxe bash
28-
dnf install -y nmap tftp
2928
```
3029

3130
## Run DHCP discover and get PXE server IP

integration/spdk/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ ARG TAG=v22.05
44
ARG ARCH=native
55

66
WORKDIR /root
7-
RUN dnf install -y git diffutils procps-ng
7+
RUN dnf install -y git diffutils procps-ng && dnf clean all
8+
9+
# hadolint ignore=DL3003
810
RUN git clone https://github.com/spdk/spdk --branch ${TAG} --depth 1 && \
911
cd spdk && git submodule update --init --depth 1 && scripts/pkgdep.sh --rdma
12+
13+
# hadolint ignore=DL3003
1014
RUN cd spdk && \
1115
./configure --disable-tests --without-vhost --without-virtio \
1216
--with-rdma --target-arch=${ARCH} && \

storage/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ ARG TAG=v22.05
77
ARG ARCH=native
88

99
WORKDIR /root
10-
RUN dnf install -y git diffutils procps-ng
10+
RUN dnf install -y git diffutils procps-ng && dnf clean all
11+
12+
# hadolint ignore=DL3003
1113
RUN git clone https://github.com/spdk/spdk --branch ${TAG} --depth 1 && \
1214
cd spdk && git submodule update --init --depth 1 && scripts/pkgdep.sh --rdma
15+
16+
# hadolint ignore=DL3003
1317
RUN cd spdk && \
1418
./configure --disable-tests --without-vhost --without-virtio \
1519
--with-rdma --target-arch=${ARCH} && \

0 commit comments

Comments
 (0)