Skip to content

Commit

Permalink
Fix Dockerfile linting errors
Browse files Browse the repository at this point in the history
Signed-off-by: Kyle Mestery <[email protected]>
  • Loading branch information
mestery committed Jul 14, 2022
1 parent 8ebc51f commit d77900d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 21 deletions.
26 changes: 12 additions & 14 deletions build/storage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ ARG HTTPS_PROXY
ARG NO_PROXY
ARG SPDK_VERSION

RUN dnf install -y git
RUN dnf install -y git && dnf clean all
COPY spdk/ /spdk
RUN mkdir /spdk-rpm
COPY core/build_base/pre-install /install
RUN chmod +x /install
RUN /install
RUN chmod +x /install && /install

################################################################################
# spdk
Expand All @@ -45,13 +44,12 @@ RUN mkdir /spdk-rpm
COPY --from=base /spdk-rpm/*.rpm /spdk-rpm/
COPY --from=base /spdk-rpm/fio /spdk-rpm/

RUN dnf install -y python python3-pip
RUN python -m pip install grpcio grpcio-tools
# hadolint ignore=DL3013
RUN dnf install -y python python3-pip && dnf clean all && python -m pip install --no-cache-dir grpcio grpcio-tools

# Wrap up the image
COPY core/build_base/post-install /install
RUN chmod +x /install
RUN /install
RUN chmod +x /install && /install


################################################################################
Expand All @@ -67,7 +65,7 @@ ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

RUN dnf install -y socat
RUN dnf install -y socat && dnf clean all
COPY core/spdk-app/init /init

ENTRYPOINT ["/init"]
Expand Down Expand Up @@ -99,8 +97,8 @@ ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

RUN dnf install -y socat
RUN pip install pyyaml
# hadolint ignore=DL3013
RUN dnf install -y socat && dnf clean all && pip install --no-cache-dir pyyaml

COPY core/ipu-storage-container/init /init
COPY --from=spdk-app /init /init_spdk
Expand All @@ -121,8 +119,8 @@ ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

RUN dnf install -y python fio python3-pip
RUN python -m pip install grpcio grpcio-tools grpcio-reflection
# hadolint ignore=DL3013
RUN dnf install -y python fio python3-pip && dnf clean all && python -m pip install --no-cache-dir grpcio grpcio-tools grpcio-reflection

COPY core/host-target/init /init
COPY core/host-target/*.py /
Expand All @@ -145,8 +143,8 @@ ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

RUN dnf install -y python fio python3-pip
RUN python -m pip install grpcio-reflection pyfakefs
# hadolint ignore=DL3013
RUN dnf install -y python fio python3-pip && dnf clean all && python -m pip install --no-cache-dir grpcio-reflection pyfakefs

COPY tests/ut/host-target /host-target/tests
COPY --from=host-target fio_runner.py /host-target/src/
Expand Down
7 changes: 3 additions & 4 deletions build/storage/tests/it/test-drivers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
# NOTICE: THIS FILE HAS BEEN MODIFIED BY INTEL CORPORATION UNDER COMPLIANCE
# WITH THE APACHE 2.0 LICENSE FROM THE ORIGINAL WORK
#
# hadolint ignore=DL3006
FROM spdk-app AS test-driver

# Generic args
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

RUN dnf install -y socat
RUN dnf install -y grpc-cli
RUN dnf install -y jq

RUN dnf install -y socat grpc-cli jq && dnf clean all

COPY tests/it/test-drivers/test-helpers /test-helpers
COPY scripts/ /scripts
Expand Down
5 changes: 2 additions & 3 deletions build/storage/tests/it/traffic-generator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ENV no_proxy=$NO_PROXY

FROM base as traffic-generator-base

RUN dnf install -y wget
RUN dnf install -y libguestfs-tools-c
RUN dnf install -y wget && dnf install -y libguestfs-tools-c && dnf clean all

COPY scripts/vm/prepare_vm.sh /scripts/vm/prepare_vm.sh
COPY scripts/run_host_target_container.sh /scripts/run_host_target_container.sh
Expand All @@ -31,7 +30,7 @@ RUN /scripts/vm/prepare_vm.sh

FROM base AS traffic-generator

RUN dnf install -y qemu-kvm
RUN dnf install -y qemu-kvm && dnf clean all
COPY tests/it/traffic-generator/init /init
COPY --from=traffic-generator-base $DRIVE_TO_BOOT $DRIVE_TO_BOOT
COPY /scripts /scripts
Expand Down

0 comments on commit d77900d

Please sign in to comment.