Updated copy.dockerfile with possible tar.gz extension instead of tgz

artanokhov · Aug 26, 2024 · e95af96 · e95af96
1 parent 29c7a73
commit e95af96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/templates/ubuntu18/install/copy.dockerfile.j2 b/templates/ubuntu18/install/copy.dockerfile.j2
@@ -5,7 +5,7 @@ ENV INTEL_OPENVINO_DIR /opt/intel/openvino
 # Creating user openvino and adding it to groups"users"
 RUN useradd -ms /bin/bash -G users openvino
 
-RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
+RUN find "${TEMP_DIR}" -name "*.tgz" -o -name "*.tar.gz" -exec tar -xzf {} \; && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
     OV_YEAR="$(echo $OV_BUILD | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
@@ -14,7 +14,7 @@ RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf ${INTEL_OPENVINO_DIR}/tools/workbench && rm -rf ${TEMP_DIR} && \
+    rm -rf ${TEMP_DIR} && \
     chown -R openvino /opt/intel/openvino_"$OV_BUILD"
 {% if no_samples is defined or 'dev_no_samples' == distribution %}
 RUN rm -rf ${INTEL_OPENVINO_DIR}/samples

diff --git a/templates/ubuntu20/install/copy.dockerfile.j2 b/templates/ubuntu20/install/copy.dockerfile.j2
@@ -5,7 +5,7 @@ ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
 # Creating user openvino and adding it to groups"users"
 RUN useradd -ms /bin/bash -G users openvino
 
-RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
+RUN find "${TEMP_DIR}" -name "*.tgz" -o -name "*.tar.gz" -exec tar -xzf {} \; && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
     OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
@@ -14,7 +14,7 @@ RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${INTEL_OPENVINO_DIR}/tools/workbench" && rm -rf "${TEMP_DIR}" && \
+    rm -rf "${TEMP_DIR}" && \
     chown -R openvino /opt/intel/openvino_"$OV_BUILD"
 {% if no_samples is defined or 'dev_no_samples' == distribution %}
 RUN rm -rf "${INTEL_OPENVINO_DIR}/samples"

diff --git a/templates/ubuntu22/install/copy.dockerfile.j2 b/templates/ubuntu22/install/copy.dockerfile.j2
@@ -5,7 +5,7 @@ ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
 # Creating user openvino and adding it to groups"users"
 RUN useradd -ms /bin/bash -G users openvino
 
-RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
+RUN find "${TEMP_DIR}" -name "*.tgz" -o -name "*.tar.gz" -exec tar -xzf {} \; && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
     OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
@@ -14,7 +14,7 @@ RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
     ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${INTEL_OPENVINO_DIR}/tools/workbench" && rm -rf "${TEMP_DIR}" && \
+    rm -rf "${TEMP_DIR}" && \
     chown -R openvino /opt/intel/openvino_"$OV_BUILD"
 {% if no_samples is defined or 'dev_no_samples' == distribution %}
 RUN rm -rf "${INTEL_OPENVINO_DIR}/samples"