File tree 8 files changed +59
-37
lines changed
8 files changed +59
-37
lines changed Original file line number Diff line number Diff line change 22
22
23
23
FROM gcr.io/oss-fuzz-base/base-builder:v1@sha256:92851d384e2525f2b8c63922994610de685438778883987a50a3509f0bf08917
24
24
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=* \
29
30
# ==================================================================
30
31
# Clean up the image (shrink the Docker image)
31
32
# ------------------------------------------------------------------
@@ -35,4 +36,6 @@ RUN apt-get update -qq && \
35
36
WORKDIR $SRC/john
36
37
COPY .clusterfuzzlite/build.sh $SRC/
37
38
COPY scripts/helper.sh /upstream
39
+
40
+ USER tester
38
41
HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -30,8 +30,11 @@ RUN dnf -y -q update \
30
30
@development-tools openssl-devel gmp-devel libpcap-devel bzip2-devel wget \
31
31
clang libasan libubsan libtsan american-fuzzy-lop zzuf pocl-devel \
32
32
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
34
35
35
- USER JtR
36
36
ENV BASE fedora
37
- CMD /bin/bash
37
+ CMD [ "/bin/bash" ]
38
+
39
+ USER tester
40
+ HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -27,17 +27,20 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
27
27
28
28
RUN apt - get update - qq \
29
29
&& 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 \
35
36
# == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == = == =
36
37
# Clean up the image (shrink the Docker image)
37
38
# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
38
39
& & apt - get - y clean \
39
40
&& rm - rf /var /lib /apt /lists /* /var /cache /apt /archives /*
40
41
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
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
27
27
28
28
# DO NOT update this automatically. OpenCL drivers are fragile and must be maintained very carefully.
29
29
# RUN apt-get update -qq \
30
- # && apt-get install -y \
30
+ # && apt-get install -y --no-install-recommends \
31
31
# build-essential libssl-dev zlib1g-dev yasm libgmp-dev libpcap-dev \
32
32
# pkg-config libbz2-dev wget \
33
33
# ocl-icd-opencl-dev clinfo git \
@@ -38,11 +38,14 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
38
38
# && apt-get update -qq \
39
39
# && apt-get install -y \
40
40
# intel-oneapi-runtime-opencl intel-basekit \
41
- # && useradd -U -m JtR \
41
+ # && useradd -U -m tester \
42
42
# && apt-get -y clean \
43
43
# && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
44
44
45
45
# Workaround for an issue in Intel libraries installation script
46
46
ENV LD_LIBRARY_PATH=/opt/intel/oneapi/2024.0/lib/:"$LD_LIBRARY_PATH"
47
47
ENV BASE ubuntu
48
- CMD /bin/bash
48
+ CMD [ "/bin/bash" ]
49
+
50
+ USER tester
51
+ HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -28,7 +28,12 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
28
28
RUN yum -y -q update \
29
29
&& yum -y install \
30
30
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
32
34
33
35
ENV BASE RedHat-UBI
34
- CMD /bin/bash
36
+ CMD [ "/bin/bash" ]
37
+
38
+ USER tester
39
+ HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -27,16 +27,18 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
27
27
28
28
RUN apt-get update -qq \
29
29
&& 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 \
34
34
# ==================================================================
35
35
# Clean up the image (shrink the Docker image)
36
36
# ------------------------------------------------------------------
37
37
&& apt-get -y clean \
38
38
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
39
39
40
- # USER JtR => it is much better to use root on Travis
41
40
ENV BASE ubuntu
42
- CMD /bin/bash
41
+ CMD [ "/bin/bash" ]
42
+
43
+ USER tester
44
+ HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -27,17 +27,18 @@ LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages
27
27
28
28
RUN apt-get update -qq \
29
29
&& 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 \
35
34
# ==================================================================
36
35
# Clean up the image (shrink the Docker image)
37
36
# ------------------------------------------------------------------
38
37
&& apt-get -y clean \
39
38
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
40
39
41
- # USER JtR => it is much better to use root on Travis
42
40
ENV BASE ubuntu
43
- CMD /bin/bash
41
+ CMD [ "/bin/bash" ]
42
+
43
+ USER tester
44
+ HEALTHCHECK NONE
Original file line number Diff line number Diff line change @@ -26,12 +26,14 @@ LABEL description="Docker images for John the Ripper CI (1.0.Fedora Latest Flatp
26
26
LABEL org.opencontainers.image.source="https://github.com/openwall/john-packages"
27
27
28
28
RUN dnf -y -q update \
29
- && dnf -y install \
29
+ && dnf -y install \
30
30
flatpak flatpak-builder elfutils wget git \
31
31
&& flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \
32
32
&& flatpak install -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08 \
33
- && useradd -U -m JtR
33
+ && useradd -U -m tester
34
34
35
- USER JtR
36
35
ENV BASE fedora
37
- CMD /bin/bash
36
+ CMD [ "/bin/bash" ]
37
+
38
+ USER tester
39
+ HEALTHCHECK NONE
You can’t perform that action at this time.
0 commit comments