Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit e115822

Browse files
author
Eoghan Russell
committed
Fix Hadolint errors
Signed-off-by: Eoghan Russell <[email protected]>
1 parent 2d2336f commit e115822

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

Diff for: .github/workflows/static-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
name: Run Hadolint
5252
with:
5353
recursive: true
54-
ignore: DL3008,DL3059
54+
ignore: DL3008,DL3059,DL3015
5555

5656
go-check:
5757
runs-on: ubuntu-latest

Diff for: ci/ci.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,11 @@ kind load docker-image testpmd
127127
ovs_e2e_test(){
128128
cd $CI_DIR/ovs_test_setup
129129
./ovs_host.sh
130-
sleep 20
130+
sleep 30
131131

132132
# workaround, cant create in dockerfile
133+
kubectl get all -A
134+
kubectl logs -n ovs pod/ovs-kind-control-plane
133135
kubectl exec -n ovs pod/ovs-kind-control-plane -- bash -c "mkdir -p /dev/net/"
134136
kubectl exec -n ovs pod/ovs-kind-control-plane -- bash -c "mknod /dev/net/tun c 10 200"
135137
kubectl exec -n ovs pod/ovs-kind-control-plane -- bash -c 'ovs-vsctl set Open_vSwitch . "other_config:dpdk-init=true"'

Diff for: ci/ovs_test_setup/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
FROM ubuntu:22.04@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f
2+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
23
RUN apt-get update -y \
3-
&& apt-get install -y --no-install-recommends openvswitch-switch-dpdk \
4+
&& apt-get install -y linux-headers-generic openvswitch-switch-dpdk \
45
&& apt-get clean \
56
&& rm -rf /var/lib/apt/lists/*
67
RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
78
# RUN sed -i "/rmmod bridge/d" /usr/share/openvswitch/scripts/ovs-kmod-ctl
8-
RUN apt-get install -y --no-install-recommends linux-headers-"$(uname -r)"
9-
CMD ["/usr/share/openvswitch/scripts/ovs-ctl", "start", "&&", "sleep", "inf"]
9+
RUN apt-get install -y --no-install-recommends linux-headers-"$(uname -r | cut -d'-' -f1)"
10+
CMD ["sh", "-c","/usr/share/openvswitch/scripts/ovs-ctl start && sleep inf"]

Diff for: ci/ovs_test_setup/testpmd_image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ WORKDIR /dpdk/build/
2121
RUN ninja
2222
WORKDIR /dpdk/build/app
2323
COPY ./testpmd.sh testpmd.sh
24-
CMD ["./testpmd.sh"]
24+
CMD ["sh", "-c","./testpmd.sh"]

Diff for: docker/testpmd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ WORKDIR /dpdk/build/
2121
RUN ninja
2222
WORKDIR /dpdk/build/app
2323
COPY ./testpmd.sh testpmd.sh
24-
CMD ["./testpmd.sh"]
24+
CMD ["sh", "-c","./testpmd.sh"]

0 commit comments

Comments
 (0)