Mercurial > p > roundup > code
diff scripts/Docker/Dockerfile @ 7634:3f268f7157f3
fix: hadolint fixups
Fix warnings reported by hadolint:
Quote strings to prevent embedded spaces in varibles from causing
misparse
Use find in place of ls to generate file list for sdist files as it
handles more charsets sanely
To run hadolint:
docker run --rm -i ghcr.io/hadolint/hadolint < scripts/Docker/Dockerfile
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Mon, 18 Sep 2023 01:05:01 -0400 |
| parents | d117ddcb0ed1 |
| children | d745a6eb0604 |
line wrap: on
line diff
--- a/scripts/Docker/Dockerfile Sun Sep 17 15:58:09 2023 -0400 +++ b/scripts/Docker/Dockerfile Mon Sep 18 01:05:01 2023 -0400 @@ -74,7 +74,7 @@ ARG VERBOSE RUN [ -z "${VERBOSE}" ] || set -xv; \ - CWD=$PWD && \ + CWD="$PWD" && \ upgrades=$(python3 -m pip --no-cache --disable-pip-version-check \ list --outdated | awk 'NR > 2 {print $1}'); \ if [ -n "$upgrades" ]; then \ @@ -82,7 +82,7 @@ python -m pip --no-cache --disable-pip-version-check \ install -U $upgrades < /dev/null; \ else \ - echo Nothing to pip update; \ + echo "Nothing to pip update"; \ fi; \ ls -l /usr/local/lib/python3.11/site-packages; \ VER=$(apk list -I 'xapian-core-dev' | \ @@ -90,14 +90,14 @@ cd /tmp && \ wget -q "https://oligarchy.co.uk/xapian/$VER/xapian-bindings-$VER.tar.xz" && \ tar -Jxvf "xapian-bindings-$VER.tar.xz" && \ - cd xapian-bindings-$VER/ && \ + cd "xapian-bindings-$VER/" && \ pip --no-cache-dir install sphinx && \ sed -i -e '/PYTHON3_SO=/s/distutils\.//g' \ -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure && \ ./configure --prefix=/usr/local --with-python3 --disable-documentation && \ make && make install && \ pip uninstall --no-cache-dir -y sphinx && \ - pip uninstall --no-cache-dir -y -r $CWD/sphinxdeps.txt && \ + pip uninstall --no-cache-dir -y -r "$CWD/sphinxdeps.txt" && \ rm -rf /usr/local/share/doc/xapian-bindings # add requirements for pip here, e.g. Whoosh, gpg, zstd or other @@ -129,7 +129,7 @@ "pypi"*) \ version_spec=$( printf "%s" "$source" | \ sed -ne 's/^pypi\([~=!<>].*\)/\1/p'); \ - pip install --no-cache-dir roundup${version_spec}; \ + pip install --no-cache-dir "roundup${version_spec}"; \ cp -ril /usr/local/lib/"python${pythonversion}"/site-packages/usr/local/share/* \ /usr/local/share;; \ "pip_local") \ @@ -137,14 +137,14 @@ pip -V && \ pip install --no-cache-dir . ;; \ "pip_sdist") \ - dist=$(ls install/dist | sed -ne '/roundup-[0-9].*\.tar\.gz$/p' | tail -n 1); \ + dist=$(find install/dist | sed -ne '/roundup-[0-9].*\.tar\.gz$/p' | tail -n 1); \ if [ -z "$dist" ] ; then \ printf "Unable to find a source distribution file in dist\n"; \ printf "Exiting\n"; \ exit 1; \ fi; \ printf "Building with distribution: %s\n" "$dist"; \ - pip install --no-cache-dir install/dist/$dist;; \ + pip install --no-cache-dir "install/dist/$dist";; \ *) \ echo "invalid value for source: $source"; \ echo "must be local, pypi, pip_local or pip_sdist"; \ @@ -192,7 +192,7 @@ python -m pip --no-cache --disable-pip-version-check \ install -U $upgrades < /dev/null; \ else \ - echo Nothing to pip update; \ + echo "Nothing to pip update"; \ fi ARG source