Merge pull request #457 from VisionSystemsInc/nullglob_self_delete

Update recipe and blueprints
VisionSystemsInc · Aug 17, 2023 · 1676bfb · 1676bfb
2 parents 0884eab + 7e29f5e
commit 1676bfb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/Justfile b/Justfile
@@ -236,6 +236,12 @@ function caseify()
         justify test int "${tests[@]}"
       )
       ;;
+    build_recipe-tests) # Build recipes tests
+      pushd "${VSI_COMMON_DIR}/docker/recipes/tests" &> /dev/null
+        Docker buildx bake ${@+"${@}"}
+      popd &> /dev/null
+      extra_args=${#}
+      ;;
     test_recipe) # Run docker recipe tests
       local JUST_IGNORE_EXIT_CODES=123
       TESTLIB_DISCOVERY_DIR="${VSI_COMMON_DIR}/docker/recipes/tests" vsi_test_env "${VSI_COMMON_DIR}/tests/run_tests" ${@+"${@}"}

diff --git a/docker/blueprints b/docker/blueprints
diff --git a/docker/recipes b/docker/recipes
diff --git a/docker/tests/python2.Dockerfile b/docker/tests/python2.Dockerfile
@@ -4,7 +4,7 @@ FROM python:2 as dep_stage
 SHELL ["/usr/bin/env", "bash", "-euxvc"]
 
 COPY --from=pipenv /usr/local /usr/local
-RUN for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
+RUN shopt -s nullglob; for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
 
 ENV WORKON_HOME=/venv \
     PIPENV_PIPFILE=/vsi/docker/tests/Pipfile2 \

diff --git a/docker/tests/python3.Dockerfile b/docker/tests/python3.Dockerfile
@@ -12,7 +12,7 @@ SHELL ["/usr/bin/env", "bash", "-euxvc"]
 #     rm -r /var/lib/apt/lists/*
 
 COPY --from=pipenv /usr/local /usr/local
-RUN for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
+RUN shopt -s nullglob; for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
 
 ENV WORKON_HOME=/venv \
     PIPENV_PIPFILE=/vsi/docker/tests/Pipfile3 \

diff --git a/docker/vsi_common/pyinstaller.Dockerfile b/docker/vsi_common/pyinstaller.Dockerfile
@@ -25,7 +25,7 @@ ENV WORKON_HOME=/venv \
     JUSTFILE=/vsi/docker/vsi_common/pyinstaller.Justfile
 
 COPY --from=pipenv /usr/local /usr/local
-RUN for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
+RUN shopt -s nullglob; for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
 
 ARG PYINSTALLER_VERSION=3.6
 RUN pip3 install pyinstaller=="${PYINSTALLER_VERSION}"

diff --git a/docker/vsi_common/sphinx.Dockerfile b/docker/vsi_common/sphinx.Dockerfile
@@ -16,7 +16,7 @@ ENV WORKON_HOME=/venv \
     JUSTFILE=/vsi/docker/vsi_common/sphinx.Justfile
 
 COPY --from=pipenv /usr/local /usr/local
-RUN for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
+RUN shopt -s nullglob; for patch in /usr/local/share/just/container_build_patch/*; do "${patch}"; done
 
 # I need these Pipfiles before the rest of VSI below. This way the cache is only
 # invalidated by the Pipfiles, not the rest of vsi_common