Change Docker building context to main DLS directory

Author: dmichalo

.github/workflows/dls-build-deb-packages-and-images.yaml

@@ -39,14 +39,13 @@ jobs:
           echo "No deb package found."
           exit 1
         fi
-    
+
     - name: Build deb img
       run: |
-        docker build -t dls-img/${{ github.repository }}/deb-${{ matrix.ubuntu_version }}:${{ github.sha }} -f ./edge-ai-libraries-repo/libraries/dl-streamer/docker/onebinary/${{ matrix.ubuntu_version }}/dlstreamer_${{ matrix.ubuntu_version }}.Dockerfile .
+        docker build -t dls-img/${{ github.repository }}/deb-${{ matrix.ubuntu_version }}:${{ github.sha }} -f ./edge-ai-libraries-repo/libraries/dl-streamer/docker/onebinary/${{ matrix.ubuntu_version }}/dlstreamer_${{ matrix.ubuntu_version }}.Dockerfile ./edge-ai-libraries-repo/libraries/dl-streamer
 
     - name: Clean up
       if: always()
       run: |
         rm -rf edge-ai-libraries-repo
         docker rmi dls-img/${{ github.repository }}/deb-${{ matrix.ubuntu_version }}:${{ github.sha }} || true
-      

.github/workflows/dls-build-dev-docker-images.yaml

@@ -29,7 +29,7 @@ jobs:
 
     - name: Build dev img
       run: |
-        docker build -t dls-img/${{ github.repository }}/${{ matrix.image }}:${{ github.sha }} -f ${{ matrix.path }} .
+        docker build -t dls-img/${{ github.repository }}/${{ matrix.image }}:${{ github.sha }} -f ${{ matrix.path }} ./edge-ai-libraries-repo/libraries/dl-streamer
 
     - name: Clean up
       if: always()

.github/workflows/dls-build-weekly-deb-image.yaml

@@ -44,7 +44,7 @@ jobs:
           echo "No deb package found."
           exit 1
         fi
-    
+
     - name: Log in to GitHub Container Registry
       uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 #3.4.0
       with:
@@ -54,7 +54,7 @@ jobs:
 
     - name: Build deb img
       run: |
-        docker build -t ghcr.io/${{ github.repository }}/dls-deb-${{ matrix.ubuntu_version }}:dls-latest -f ./edge-ai-libraries-repo/libraries/dl-streamer/docker/onebinary/${{ matrix.ubuntu_version }}/dlstreamer_${{ matrix.ubuntu_version }}.Dockerfile .
+        docker build -t ghcr.io/${{ github.repository }}/dls-deb-${{ matrix.ubuntu_version }}:dls-latest -f ./edge-ai-libraries-repo/libraries/dl-streamer/docker/onebinary/${{ matrix.ubuntu_version }}/dlstreamer_${{ matrix.ubuntu_version }}.Dockerfile ./edge-ai-libraries-repo/libraries/dl-streamer
 
     - name: Push Docker img
       run: |

libraries/dl-streamer/docker/devel/ubuntu22/dlstreamer_dev_ubuntu22.Dockerfile

@@ -25,7 +25,12 @@ ENV GST_VA_ALL_DRIVERS=1
 
 SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
 
+COPY scripts/DLS_install_prerequisites.sh /DLS_install_prerequisites.sh
+
 RUN \
+    chmod +x /DLS_install_prerequisites.sh && \
+    /DLS_install_prerequisites.sh --on-host-or-docker=docker_ubuntu22 && \
+    rm -f /DLS_install_prerequisites.sh && \
     apt-get update && \
     apt-get install -y -q --no-install-recommends wget=\* xz-utils=\* python3-pip=\* python3-gi=\* gcc-multilib=\* libglib2.0-dev=\* \
     flex=\* bison=\* autoconf=\* automake=\* libtool=\* libogg-dev=\* make=\* g++=\* libva-dev=\* yasm=\* libglx-dev=\* libdrm-dev=\* \
@@ -34,10 +39,6 @@ RUN \
     libcairo2-dev=\* libxt-dev=\* libgirepository1.0-dev=\* libgles2-mesa-dev=\* wayland-protocols=\* libcurl4-openssl-dev=\* \
     libssh2-1-dev=\* cmake=\* git=\* valgrind=\* numactl=\* libvpx-dev=\* libopus-dev=\* libsrtp2-dev=\* libxv-dev=\* \
     linux-libc-dev=\* libpmix2=\* libhwloc15=\* libhwloc-plugins=\* libxcb1-dev=\* libx11-xcb-dev=\* && \
-    wget -q https://raw.githubusercontent.com/open-edge-platform/edge-ai-libraries/main/libraries/dl-streamer/scripts/DLS_install_prerequisites.sh && \
-    chmod +x DLS_install_prerequisites.sh && \
-    ./DLS_install_prerequisites.sh --on-host-or-docker=docker_ubuntu22 && \
-    rm -f DLS_install_prerequisites.sh && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -258,7 +259,7 @@ RUN \
 # Intel® DL Streamer
 WORKDIR "$DLSTREAMER_DIR"
 
-COPY edge-ai-libraries-repo/libraries/dl-streamer/ "${DLSTREAMER_DIR}"
+COPY . "${DLSTREAMER_DIR}"
 
 RUN \
     mkdir build && \

libraries/dl-streamer/docker/devel/ubuntu24/dlstreamer_dev_ubuntu24.Dockerfile

@@ -27,7 +27,12 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
 
 RUN userdel -r ubuntu
 
+COPY scripts/DLS_install_prerequisites.sh /DLS_install_prerequisites.sh
+
 RUN \
+    chmod +x /DLS_install_prerequisites.sh && \
+    /DLS_install_prerequisites.sh --on-host-or-docker=docker_ubuntu24 && \
+    rm -f /DLS_install_prerequisites.sh && \
     apt-get update && \
     apt-get install -y -q --no-install-recommends wget=\* xz-utils=\* python3-pip=\* python3-gi=\* gcc-multilib=\* libglib2.0-dev=\* \
     flex=\* bison=\* autoconf=\* automake=\* libtool=\* libogg-dev=\* make=\* g++=\* libva-dev=\* yasm=\* libglx-dev=\* libdrm-dev=\* \
@@ -36,10 +41,6 @@ RUN \
     libcairo2-dev=\* libxt-dev=\* libgirepository1.0-dev=\* libgles2-mesa-dev=\* wayland-protocols=\* libcurl4-openssl-dev=\* \
     libssh2-1-dev=\* cmake=\* git=\* valgrind=\* numactl=\* libvpx-dev=\* libopus-dev=\* libsrtp2-dev=\* libxv-dev=\* \
     linux-libc-dev=\* libpmix2t64=\* libhwloc15=\* libhwloc-plugins=\* libxcb1-dev=\* libx11-xcb-dev=\* && \
-    wget -q https://raw.githubusercontent.com/open-edge-platform/edge-ai-libraries/main/libraries/dl-streamer/scripts/DLS_install_prerequisites.sh && \
-    chmod +x DLS_install_prerequisites.sh && \
-    ./DLS_install_prerequisites.sh --on-host-or-docker=docker_ubuntu24 && \
-    rm -f DLS_install_prerequisites.sh && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -245,7 +246,7 @@ RUN \
 # Intel® DL Streamer
 WORKDIR "$DLSTREAMER_DIR"
 
-COPY edge-ai-libraries-repo/libraries/dl-streamer/ "${DLSTREAMER_DIR}"
+COPY . "${DLSTREAMER_DIR}"
 
 RUN \
     mkdir build && \

libraries/dl-streamer/docker/onebinary/ubuntu22/dlstreamer_ubuntu22.Dockerfile

@@ -25,7 +25,7 @@ RUN \
     apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 
 RUN mkdir -p /debs
-COPY edge-ai-libraries-repo/libraries/dl-streamer/deb_packages/*.deb /debs/
+COPY ./deb_packages/*.deb /debs/
 
 ARG DEBIAN_FRONTEND=noninteractive
 

libraries/dl-streamer/docker/onebinary/ubuntu24/dlstreamer_ubuntu24.Dockerfile

@@ -25,7 +25,7 @@ RUN \
     apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 
 RUN mkdir -p /debs
-COPY edge-ai-libraries-repo/libraries/dl-streamer/deb_packages/*.deb /debs/
+COPY ./deb_packages/*.deb /debs/
 
 ARG DEBIAN_FRONTEND=noninteractive