Add docker files to build spdk-core image for arm and amd 2

Author: wmousa

.github/workflows/spdk_container_image_builder_amd.yml

@@ -18,7 +18,7 @@ jobs:
 
 
     - name: Build the docker image
-      run: docker build --file docker/Dockerfile_spdk --tag simplyblock/spdk-core:BRANCH_NAME-amd64 .
+      run: docker build --file docker/Dockerfile_spdk --tag simplyblock/spdk-core:$BRANCH_NAME-amd64 .
 
     - name: Login to Docker Hub
       uses: docker/login-action@v1
@@ -47,7 +47,7 @@ jobs:
       run: docker image push 565979732541.dkr.ecr.us-east-1.amazonaws.com/spdk-core:$BRANCH_NAME-amd64
     - name: Create the manifest
       run: |
-        docker manifest create simplyblock/spdk-core:$BRANCH_NAME-latest simplyblock/spdk-core:arm64 simplyblock/spdk-core:$BRANCH_NAME-amd64
+        docker manifest create simplyblock/spdk-core:$BRANCH_NAME-latest simplyblock/spdk-core:$BRANCH_NAME-arm64 simplyblock/spdk-core:$BRANCH_NAME-amd64
         docker manifest create 565979732541.dkr.ecr.us-east-1.amazonaws.com/spdk-core:$BRANCH_NAME-latest 565979732541.dkr.ecr.us-east-1.amazonaws.com/spdk-core:$BRANCH_NAME-arm64 565979732541.dkr.ecr.us-east-1.amazonaws.com/spdk-core:$BRANCH_NAME-amd64
         docker manifest annotate simplyblock/spdk-core:$BRANCH_NAME-latest simplyblock/spdk-core:$BRANCH_NAME-arm64 --arch arm64
         docker manifest annotate simplyblock/spdk-core:$BRANCH_NAME-latest simplyblock/spdk-core:$BRANCH_NAME-amd64 --arch amd64

docker/Dockerfile_spdk

@@ -24,6 +24,6 @@ RUN sed -i "s/^#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC.*/#define SPDK_BDEV_QOS_MIN
 
 RUN sed -i "s/^#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC.*/#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC\t5000/" /root/spdk/lib/bdev/bdev.c
 
-RUN cd spdk && ./configure --with-crypto --with-rdma --disable-tests --disable-unit-tests --disable-examples --with-ocf --with-fuse --with-nvme-cuse
+RUN cd spdk && ./configure --with-crypto --with-rdma --disable-tests --disable-unit-tests --disable-examples --with-ocf --with-fuse --with-nvme-cuse --target-arch=nehalem
 
 RUN cd spdk && make --no-builtin-rules -j16

docker/Dockerfile_spdk_arm

@@ -1,22 +1,15 @@
 FROM fedora:37
 
-# push to "simplyblock/spdk-core:latest"
+# push to "simplyblock/spdk-core:$TAG"
 
 USER root
 
 WORKDIR /root
 
-COPY api api/
-COPY scripts scripts/
+COPY ./ /root/spdk/
 
 RUN dnf install -y git diffutils procps-ng pip kmod hostname wget pkg-config cmake nano systemd-udev
 
-#RUN wget https://github.com/apple/foundationdb/releases/download/7.3.3/foundationdb-clients-7.3.3-1.el7.x86_64.rpm
-#RUN rpm -Uvh foundationdb-clients-7.3.3-1.el7.x86_64.rpm
-#RUN rm -f foundationdb-clients-7.3.3-1.el7.x86_64.rpm
-
-RUN git clone https://github.com/simplyblock-io/spdk --depth 1 -b v24.05
-
 RUN cd spdk && git submodule update --init --depth 1
 
 RUN cd spdk && scripts/pkgdep.sh --rdma --pmem
@@ -25,8 +18,6 @@ RUN mkdir /tmp/pmem
 
 RUN pip3 install grpcio-tools==1.51.3 protobuf==4.22.1
 
-RUN pip3 install -r /root/api/requirements.txt
-
 RUN sed -i "s/^#define SPDK_JSONRPC_RECV_BUF_SIZE.*/#define SPDK_JSONRPC_RECV_BUF_SIZE\t(32 * 1024 * 1024)/" /root/spdk/lib/jsonrpc/jsonrpc_internal.h
 
 RUN sed -i "s/^#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC.*/#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC\t200/" /root/spdk/lib/bdev/bdev.c