Skip to content

Commit cb836ad

Browse files
author
fibu0125
committed
fix: resolve DOCKERFILE_HADOLINT
1 parent d196045 commit cb836ad

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

alpine/Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ ARG TMP_DIR="/tmp"
1010

1111
COPY requirements.txt ${BACKUP_DAEMON_HOME}/
1212

13+
# hadolint ignore=DL3018
1314
RUN set -x \
14-
&& pip3 install --upgrade pip==${PIP} setuptools==${SETUPTOOLS} \
15+
&& pip3 install --no-cache-dir --upgrade pip==${PIP} setuptools==${SETUPTOOLS} \
1516
&& rm -rf /var/cache/apk/* \
1617
&& apk add --no-cache curl sqlite sqlite-dev build-base ca-certificates \
1718
&& wget \
1819
-nv \
1920
-O ${TMP_DIR}/apsw-${PY_APSW_VER}.zip \
2021
"https://github.com/rogerbinns/apsw/releases/download/${PY_APSW_VER}/apsw-${PY_APSW_VER}.zip" \
21-
&& unzip ${TMP_DIR}/apsw-${PY_APSW_VER}.zip && cd ./apsw-${PY_APSW_VER}/ && python setup.py install \
22-
&& rm -rf ${TMP_DIR}/* \
23-
&& pip3 install -r ${BACKUP_DAEMON_HOME}/requirements.txt \
22+
&& unzip ${TMP_DIR}/apsw-${PY_APSW_VER}.zip && python ${TMP_DIR}/apsw-${PY_APSW_VER}/setup.py install \
23+
&& rm -rf "${TMP_DIR:?}/"* \
24+
&& pip3 install --no-cache-dir -r ${BACKUP_DAEMON_HOME}/requirements.txt \
2425
&& apk del build-base
2526

2627
RUN addgroup -S backup && adduser -S backup -G backup
@@ -30,13 +31,11 @@ RUN python3 -m unittest discover -s ${BACKUP_DAEMON_HOME} -p "*_tests.py"
3031

3132
COPY tools/bdcli.py /usr/bin/bdcli
3233

33-
RUN chmod +x /usr/bin/bdcli
34-
RUN chmod 777 /var/log
35-
36-
RUN mkdir -p ${S3_CERT_PATH_INTERNAL} \
37-
&& chmod 770 ${S3_CERT_PATH_INTERNAL}
38-
39-
RUN chown -R backup:backup ${BACKUP_DAEMON_HOME} ${S3_CERT_PATH_INTERNAL} /var/log
34+
RUN chmod +x /usr/bin/bdcli \
35+
&& chmod 770 /var/log \
36+
&& mkdir -p ${S3_CERT_PATH_INTERNAL} \
37+
&& chmod 770 ${S3_CERT_PATH_INTERNAL} \
38+
&& chown -R backup:backup ${BACKUP_DAEMON_HOME} ${S3_CERT_PATH_INTERNAL} /var/log
4039

4140
USER backup
4241

0 commit comments

Comments
 (0)