Skip to content

Commit 83648a2

Browse files
committed
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
1 parent 768f49f commit 83648a2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

scripts/Docker/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,30 +74,30 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
7474
ARG VERBOSE
7575

7676
RUN [ -z "${VERBOSE}" ] || set -xv; \
77-
CWD=$PWD && \
77+
CWD="$PWD" && \
7878
upgrades=$(python3 -m pip --no-cache --disable-pip-version-check \
7979
list --outdated | awk 'NR > 2 {print $1}'); \
8080
if [ -n "$upgrades" ]; then \
8181
echo "Pip updating $upgrades"; \
8282
python -m pip --no-cache --disable-pip-version-check \
8383
install -U $upgrades < /dev/null; \
8484
else \
85-
echo Nothing to pip update; \
85+
echo "Nothing to pip update"; \
8686
fi; \
8787
ls -l /usr/local/lib/python3.11/site-packages; \
8888
VER=$(apk list -I 'xapian-core-dev' | \
8989
sed 's/^xapian-core-dev-\([0-9.]*\)-.*/\1/') && \
9090
cd /tmp && \
9191
wget -q "https://oligarchy.co.uk/xapian/$VER/xapian-bindings-$VER.tar.xz" && \
9292
tar -Jxvf "xapian-bindings-$VER.tar.xz" && \
93-
cd xapian-bindings-$VER/ && \
93+
cd "xapian-bindings-$VER/" && \
9494
pip --no-cache-dir install sphinx && \
9595
sed -i -e '/PYTHON3_SO=/s/distutils\.//g' \
9696
-e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure && \
9797
./configure --prefix=/usr/local --with-python3 --disable-documentation && \
9898
make && make install && \
9999
pip uninstall --no-cache-dir -y sphinx && \
100-
pip uninstall --no-cache-dir -y -r $CWD/sphinxdeps.txt && \
100+
pip uninstall --no-cache-dir -y -r "$CWD/sphinxdeps.txt" && \
101101
rm -rf /usr/local/share/doc/xapian-bindings
102102

103103
# add requirements for pip here, e.g. Whoosh, gpg, zstd or other
@@ -129,22 +129,22 @@ RUN [ -z "${VERBOSE}" ] || set -xv; \
129129
"pypi"*) \
130130
version_spec=$( printf "%s" "$source" | \
131131
sed -ne 's/^pypi\([~=!<>].*\)/\1/p'); \
132-
pip install --no-cache-dir roundup${version_spec}; \
132+
pip install --no-cache-dir "roundup${version_spec}"; \
133133
cp -ril /usr/local/lib/"python${pythonversion}"/site-packages/usr/local/share/* \
134134
/usr/local/share;; \
135135
"pip_local") \
136136
cd install && \
137137
pip -V && \
138138
pip install --no-cache-dir . ;; \
139139
"pip_sdist") \
140-
dist=$(ls install/dist | sed -ne '/roundup-[0-9].*\.tar\.gz$/p' | tail -n 1); \
140+
dist=$(find install/dist | sed -ne '/roundup-[0-9].*\.tar\.gz$/p' | tail -n 1); \
141141
if [ -z "$dist" ] ; then \
142142
printf "Unable to find a source distribution file in dist\n"; \
143143
printf "Exiting\n"; \
144144
exit 1; \
145145
fi; \
146146
printf "Building with distribution: %s\n" "$dist"; \
147-
pip install --no-cache-dir install/dist/$dist;; \
147+
pip install --no-cache-dir "install/dist/$dist";; \
148148
*) \
149149
echo "invalid value for source: $source"; \
150150
echo "must be local, pypi, pip_local or pip_sdist"; \
@@ -192,7 +192,7 @@ RUN apk --no-cache upgrade; \
192192
python -m pip --no-cache --disable-pip-version-check \
193193
install -U $upgrades < /dev/null; \
194194
else \
195-
echo Nothing to pip update; \
195+
echo "Nothing to pip update"; \
196196
fi
197197

198198
ARG source

0 commit comments

Comments
 (0)