Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/docker-base-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
SHORT_SHA=$(echo ${{ env.SHA }} | head -c 8)
docker buildx ls
docker buildx create --name mybuilder --bootstrap --use
docker buildx build --platform linux/amd64,linux/arm64 -t simplyblock/spdkcsi:base_image \
-t public.ecr.aws/simply-block/spdkcsi:base_image -f deploy/image/Dockerfile_base . --push
echo "::notice title=Docker.com::simplyblock/spdkcsi:base_image
echo "::notice title=AWS-ECR::public.ecr.aws/simply-block/spdkcsi:base_image

docker buildx build --platform linux/amd64,linux/arm64 -t simplyblock/spdkcsi:base_image_rhel \
-t public.ecr.aws/simply-block/spdkcsi:base_image_rhel -f deploy/image/Dockerfile_base . --push
echo "::notice title=Docker.com::simplyblock/spdkcsi:base_image_rhel
echo "::notice title=AWS-ECR::public.ecr.aws/simply-block/spdkcsi:base_image_rhel

2 changes: 1 addition & 1 deletion charts/spdk-csi/latest/spdk-csi/templates/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
exec:
command:
[
"/bin/sh", "-c",
"sudo", "/bin/sh", "-c",
"modprobe nvme-tcp || echo failed to modprobe nvme-tcp && \
modprobe nvme-rdma || echo failed to modprobe nvme-rdma && \
if [ ! -f /var/lib/nvme/hostid ]; then uuidgen > /var/lib/nvme/hostid; fi && \
Expand Down
14 changes: 7 additions & 7 deletions deploy/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#
# XXX: pin alpine to 3.8 with e2fsprogs-1.44
# e2fsprogs-1.45+ crashes my test vm when running mkfs.ext4
FROM alpine:3.18
LABEL maintainers="SPDK-CSI Authors"
LABEL description="SPDK-CSI Plugin"
FROM simplyblock/spdkcsi:base_image_rhel

COPY spdkcsi /usr/local/bin/spdkcsi

RUN apk update && \
apk add nvme-cli open-iscsi e2fsprogs xfsprogs blkid xfsprogs-extra e2fsprogs-extra util-linux
USER simplyblock
WORKDIR /app

ENTRYPOINT ["/usr/local/bin/spdkcsi"]
COPY spdkcsi .
RUN sudo chown simplyblock:simplyblock /app/spdkcsi
RUN sudo chmod +x /app/spdkcsi

ENTRYPOINT ["sudo", "-E", "/app/spdkcsi"]
22 changes: 13 additions & 9 deletions deploy/image/Dockerfile_base
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
FROM fedora:43
FROM redhat/ubi9:latest
LABEL name="simplyblock"
LABEL vendor="Simplyblock"
LABEL version="1.0.0"
LABEL release="1"
LABEL summary="Simplyblock csi driver component"
LABEL description="Simplyblock csi driver container"
LABEL maintainer="developers@simplyblock.io"
COPY LICENSE /licenses/LICENSE

RUN dnf -y update && \
dnf -y install \
nvme-cli \
iscsi-initiator-utils \
e2fsprogs \
xfsprogs \
util-linux \
sudo
ARG TARGETPLATFORM
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
echo "ARM64 version"; \
dnf install -y https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/getPackage/oraclelinux-release-el9-1.0-26.el9.aarch64.rpm ; \
else \
echo "AMD64 version"; \
dnf install -y https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/oraclelinux-release-el9-1.0-26.el9.x86_64.rpm ; \
fi

RUN dnf update -y --nogpgcheck
RUN dnf install -y nvme-cli iscsi-initiator-utils e2fsprogs xfsprogs util-linux kmod wget sudo rpm --nogpgcheck

RUN useradd -ms /bin/bash simplyblock
RUN echo "simplyblock ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
Expand Down
Loading