Skip to content

Commit

Permalink
build: refactor dockerfile to simplify selinux config directory creation
Browse files Browse the repository at this point in the history
Signed-off-by: Ali Afsharzadeh <[email protected]>
  • Loading branch information
guoard authored and mergify[bot] committed Dec 9, 2024
1 parent a32ba13 commit 1c93d9e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion deploy/cephcsi/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM ${BASE_IMAGE} as updated_base
RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true

RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN mkdir -p /etc/selinux && touch /etc/selinux/config

RUN dnf -y update --nobest \
&& dnf -y install nfs-utils \
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.devel
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN source /build.env \
RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true

RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN mkdir -p /etc/selinux && touch /etc/selinux/config

# other/conflicting versions of protobuf get installed as dependency
RUN dnf -y remove protobuf
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV \

COPY build.env /

RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN mkdir -p /etc/selinux && touch /etc/selinux/config

RUN source /build.env \
&& \
Expand Down

0 comments on commit 1c93d9e

Please sign in to comment.