Skip to content

Commit 884b3b8

Browse files
author
Claudio André
committed
ci(docker): mute linter complaints (#561)
Silence some warnings detected by linters that probably won't have an impact on the final product. Signed-off-by: Claudio André <[email protected]>
1 parent 82083a0 commit 884b3b8

8 files changed

+59
-37
lines changed

.clusterfuzzlite/Dockerfile

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
FROM gcr.io/oss-fuzz-base/base-builder:v1@sha256:92851d384e2525f2b8c63922994610de685438778883987a50a3509f0bf08917
2424

25-
RUN git clone --depth 1 https://github.com/openwall/john.git /upstream
26-
RUN apt-get update -qq && \
27-
apt-get install -y --no-install-recommends libssl-dev=* zlib1g-dev=* && \
28-
apt-get install -y --no-install-recommends libgmp-dev=* libpcap-dev=* libbz2-dev=* \
25+
RUN git clone --depth 1 https://github.com/openwall/john.git /upstream \
26+
&& apt-get update -qq \
27+
&& apt-get install -y --no-install-recommends \
28+
libbz2-dev=* libgmp-dev=* libpcap-dev=* \
29+
libssl-dev=* zlib1g-dev=* \
2930
# ==================================================================
3031
# Clean up the image (shrink the Docker image)
3132
# ------------------------------------------------------------------
@@ -35,4 +36,6 @@ RUN apt-get update -qq && \
3536
WORKDIR $SRC/john
3637
COPY .clusterfuzzlite/build.sh $SRC/
3738
COPY scripts/helper.sh /upstream
39+
40+
USER tester
3841
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.FedoraLatest

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ RUN dnf -y -q update \
3030
@development-tools openssl-devel gmp-devel libpcap-devel bzip2-devel wget \
3131
clang libasan libubsan libtsan american-fuzzy-lop zzuf pocl-devel \
3232
american-fuzzy-lop-clang \
33-
&& useradd -U -m JtR
33+
# Azure DevOps requires a root user
34+
&& useradd --uid 0 --non-unique --gid 0 -U -m tester
3435

35-
USER JtR
3636
ENV BASE fedora
37-
CMD /bin/bash
37+
CMD [ "/bin/bash" ]
38+
39+
USER tester
40+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.OpenCL

+11-8
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,20 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
2727

2828
RUN apt-get update -qq \
2929
&& export DEBIAN_FRONTEND="noninteractive" \
30-
&& apt-get install -y \
31-
build-essential libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev \
32-
libbz2-dev wget llvm libomp-dev zlib1g-dev git clang afl++ zzuf \
33-
libpocl-dev ocl-icd-opencl-dev ocl-icd-libopencl1 pocl-opencl-icd opencl-headers \
34-
&& useradd -U -m JtR \
30+
&& apt-get install -y --no-install-recommends \
31+
afl++ build-essential clang debhelper git libbz2-dev libgmp-dev libnet1-dev libomp-dev \
32+
libpcap-dev libpocl-dev libssl-dev llvm ocl-icd-libopencl1 ocl-icd-opencl-dev \
33+
opencl-headers pkg-config pocl-opencl-icd wget yasm zlib1g-dev zzuf \
34+
# Azure DevOps requires a root user
35+
&& useradd --uid 0 --non-unique --gid 0 -U -m tester \
3536
# ==================================================================
3637
# Clean up the image (shrink the Docker image)
3738
# ------------------------------------------------------------------
3839
&& apt-get -y clean \
3940
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
4041

41-
# USER JtR => it is much better to use root on Travis
42-
ENV BASE ubuntu
43-
CMD /bin/bash
42+
ENV BASE ubuntu-pocl
43+
CMD [ "/bin/bash" ]
44+
45+
USER tester
46+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.OpenCL-IntelCPU

+6-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
2727

2828
# DO NOT update this automatically. OpenCL drivers are fragile and must be maintained very carefully.
2929
# RUN apt-get update -qq \
30-
# && apt-get install -y \
30+
# && apt-get install -y --no-install-recommends \
3131
# build-essential libssl-dev zlib1g-dev yasm libgmp-dev libpcap-dev \
3232
# pkg-config libbz2-dev wget \
3333
# ocl-icd-opencl-dev clinfo git \
@@ -38,11 +38,14 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
3838
# && apt-get update -qq \
3939
# && apt-get install -y \
4040
# intel-oneapi-runtime-opencl intel-basekit \
41-
# && useradd -U -m JtR \
41+
# && useradd -U -m tester \
4242
# && apt-get -y clean \
4343
# && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
4444

4545
# Workaround for an issue in Intel libraries installation script
4646
ENV LD_LIBRARY_PATH=/opt/intel/oneapi/2024.0/lib/:"$LD_LIBRARY_PATH"
4747
ENV BASE ubuntu
48-
CMD /bin/bash
48+
CMD [ "/bin/bash" ]
49+
50+
USER tester
51+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.RHUbi8

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
2828
RUN yum -y -q update \
2929
&& yum -y install \
3030
openssl-devel gmp-devel libpcap-devel bzip2-devel wget gcc git perl \
31-
&& useradd -U -m JtR
31+
&& yum clean all \
32+
# Azure DevOps requires a root user
33+
&& useradd --uid 0 --non-unique --gid 0 -U -m tester
3234

3335
ENV BASE RedHat-UBI
34-
CMD /bin/bash
36+
CMD [ "/bin/bash" ]
37+
38+
USER tester
39+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.UbuntuDevel

+8-6
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
2727

2828
RUN apt-get update -qq \
2929
&& export DEBIAN_FRONTEND="noninteractive" \
30-
&& apt-get install -y \
31-
build-essential libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev \
32-
libbz2-dev wget llvm libomp-dev zlib1g-dev git clang \
33-
&& useradd -U -m JtR \
30+
&& apt-get install -y --no-install-recommends \
31+
build-essential ca-certificates clang debhelper git libbz2-dev libgmp-dev \
32+
libnet1-dev libomp-dev libpcap-dev libssl-dev llvm pkg-config wget yasm zlib1g-dev \
33+
&& useradd -U -m tester \
3434
# ==================================================================
3535
# Clean up the image (shrink the Docker image)
3636
# ------------------------------------------------------------------
3737
&& apt-get -y clean \
3838
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
3939

40-
# USER JtR => it is much better to use root on Travis
4140
ENV BASE ubuntu
42-
CMD /bin/bash
41+
CMD [ "/bin/bash" ]
42+
43+
USER tester
44+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.UbuntuRolling

+8-7
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
2727

2828
RUN apt-get update -qq \
2929
&& export DEBIAN_FRONTEND="noninteractive" \
30-
&& apt-get install -y \
31-
build-essential libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev \
32-
libbz2-dev wget llvm libomp-dev zlib1g-dev git clang \
33-
libusb-1.0-0-dev \
34-
&& useradd -U -m JtR \
30+
&& apt-get install -y --no-install-recommends \
31+
build-essential clang debhelper git libbz2-dev libgmp-dev libnet1-dev libomp-dev \
32+
libpcap-dev libssl-dev libusb-1.0-0-dev llvm pkg-config wget yasm zlib1g-dev \
33+
&& useradd -U -m tester \
3534
# ==================================================================
3635
# Clean up the image (shrink the Docker image)
3736
# ------------------------------------------------------------------
3837
&& apt-get -y clean \
3938
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
4039

41-
# USER JtR => it is much better to use root on Travis
4240
ENV BASE ubuntu
43-
CMD /bin/bash
41+
CMD [ "/bin/bash" ]
42+
43+
USER tester
44+
HEALTHCHECK NONE

CI/Dockerfiles/Dockerfile.flatpak.package

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ LABEL description="Docker images for John the Ripper CI (1.0.Fedora Latest Flatp
2626
LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages"
2727

2828
RUN dnf -y -q update \
29-
&& dnf -y install \
29+
&& dnf -y install \
3030
flatpak flatpak-builder elfutils wget git \
3131
&& flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \
3232
&& flatpak install -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08 \
33-
&& useradd -U -m JtR
33+
&& useradd -U -m tester
3434

35-
USER JtR
3635
ENV BASE fedora
37-
CMD /bin/bash
36+
CMD [ "/bin/bash" ]
37+
38+
USER tester
39+
HEALTHCHECK NONE

0 commit comments

Comments
 (0)