From 500ceffc7e1ccf71153a7da34b13fd9505c68bae Mon Sep 17 00:00:00 2001 From: f0cker <> Date: Wed, 20 Dec 2023 11:10:40 +0000 Subject: [PATCH 1/4] fixes #40 fixes #41 --- docker-compose.nvidia.yml | 8 +++++++- docker/common/requirements.txt | 2 +- docker/nvidia/ubuntu/Dockerfile | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docker-compose.nvidia.yml b/docker-compose.nvidia.yml index dfb2488..b110dc0 100644 --- a/docker-compose.nvidia.yml +++ b/docker-compose.nvidia.yml @@ -16,6 +16,13 @@ services: context: ./build dockerfile: Dockerfile image: "nvidia-ubuntu" + deploy: + resources: + reservations: + devices: + -driver: nvidia + capabilities: [gpu] + count: all ports: - "127.0.0.1:8080:8080" depends_on: @@ -28,7 +35,6 @@ services: - /var/crackq/:/var/crackq - ./crackq:/opt/crackq/build/crackq/ stdin_open: true - runtime: nvidia user: crackq tty: true environment: diff --git a/docker/common/requirements.txt b/docker/common/requirements.txt index d1cdb7a..2a29394 100644 --- a/docker/common/requirements.txt +++ b/docker/common/requirements.txt @@ -12,7 +12,7 @@ Flask-SQLAlchemy==3.0.5 SQLAlchemy-Utils==0.41.1 flask-talisman==0.7.0 pysaml2==7.3.1 -Flask-Login==0.6.2 +Flask-Login==0.6.3 Flask-Cors==3.0.9 Flask-SeaSurf==1.1.1 Flask-Migrate==3.0.1 diff --git a/docker/nvidia/ubuntu/Dockerfile b/docker/nvidia/ubuntu/Dockerfile index f6e1c54..51cd1e3 100644 --- a/docker/nvidia/ubuntu/Dockerfile +++ b/docker/nvidia/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM nvidia/cuda:12.2.0-runtime-ubuntu20.04 +FROM nvidia/cuda:12.3.1-devel-ubuntu20.04 ENV TZ=Europe/London ENV DEBIAN_FRONTEND noninteractive From 84c606d3af255c63eb3538e53d21aa47dda63e9c Mon Sep 17 00:00:00 2001 From: f0cker <> Date: Wed, 20 Dec 2023 12:10:36 +0000 Subject: [PATCH 2/4] fix compose config --- docker-compose.nvidia.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.nvidia.yml b/docker-compose.nvidia.yml index b110dc0..22a7df5 100644 --- a/docker-compose.nvidia.yml +++ b/docker-compose.nvidia.yml @@ -20,9 +20,9 @@ services: resources: reservations: devices: - -driver: nvidia - capabilities: [gpu] - count: all + - driver: nvidia + capabilities: [gpu] + count: all ports: - "127.0.0.1:8080:8080" depends_on: From fc1fba65ab6973292fcbb084d7fe05346261d2ba Mon Sep 17 00:00:00 2001 From: f0cker <> Date: Wed, 20 Dec 2023 13:26:35 +0000 Subject: [PATCH 3/4] Updated changelog --- CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6d6ae84..6f2c6aa 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,10 @@ Changelog ========= +v0.1.2 +------------ +- Fixed issues #40/#41, updated nvidia docker config and flask-login +- Updated Wiki install guide + v0.1.1 ------------ - Updated python libs, docker image From ba6f571e334e66bde848eb22dc7485572e296fcd Mon Sep 17 00:00:00 2001 From: f0cker <> Date: Fri, 29 Dec 2023 13:24:37 +0000 Subject: [PATCH 4/4] Updating Dockerfile --- docker/nvidia/ubuntu/Dockerfile | 14 +++++++------- docker/opencl/ubuntu/Dockerfile | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docker/nvidia/ubuntu/Dockerfile b/docker/nvidia/ubuntu/Dockerfile index 51cd1e3..37699e6 100644 --- a/docker/nvidia/ubuntu/Dockerfile +++ b/docker/nvidia/ubuntu/Dockerfile @@ -12,13 +12,13 @@ ENV PYTHONPATH=$DOCKYARD:/opt/crackq/build/crackq # Update & install packages for installing hashcat RUN apt-get update && \ apt-get install -y wget p7zip gcc g++ make build-essential git libcurl4-openssl-dev libssl-dev zlib1g-dev python3.8 \ - python3.8-dev python3-pip libldap2-dev libsasl2-dev libssl-dev xmlsec1 libxmlsec1-openssl - + python3.8-dev python3-pip libldap2-dev libsasl2-dev libssl-dev xmlsec1 libxmlsec1-openssl \ + && apt-get clean # Copy the code to the build dir -COPY . $DOCKYARD +COPY . "$DOCKYARD" # Run install script to setup hashcat/pyhashcat -WORKDIR $DOCKYARD -RUN $DOCKYARD/setup.sh +WORKDIR "$DOCKYARD" +RUN "$DOCKYARD"/setup.sh EXPOSE 6379 EXPOSE 8081 @@ -27,7 +27,7 @@ EXPOSE 8080 ENV LANG "C.UTF-8" ENV LC_ALL "C.UTF-8" -RUN chown -R 1111:1111 $DOCKYARD/ +RUN chown -R 1111:1111 "$DOCKYARD"/ USER crackq -WORKDIR $DOCKYARD/ +WORKDIR "$DOCKYARD"/ CMD ["/usr/local/bin/circusd", "/opt/crackq/build/circus.ini"] diff --git a/docker/opencl/ubuntu/Dockerfile b/docker/opencl/ubuntu/Dockerfile index 95404b4..7053ee1 100644 --- a/docker/opencl/ubuntu/Dockerfile +++ b/docker/opencl/ubuntu/Dockerfile @@ -13,18 +13,18 @@ RUN apt update RUN apt install intel-oneapi-runtime-libs intel-oneapi-runtime-opencl -yq ENV DOCKYARD=/opt/crackq/build -ENV PYTHONPATH=$DOCKYARD:/opt/crackq/build/crackq +ENV PYTHONPATH="$DOCKYARD":/opt/crackq/build/crackq # Update & install packages for installing hashcat RUN apt-get update && \ apt-get install -y wget p7zip gcc g++ make build-essential git libcurl4-openssl-dev libssl-dev zlib1g-dev python3.8 \ - python3.8-dev python3-pip libldap2-dev libsasl2-dev libssl-dev xmlsec1 libxmlsec1-openssl - + python3.8-dev python3-pip libldap2-dev libsasl2-dev libssl-dev xmlsec1 libxmlsec1-openssl \ + && apt-get clean # Copy the code to the build dir -COPY . $DOCKYARD +COPY . "$DOCKYARD" # Run install script to setup hashcat/pyhashcat -WORKDIR $DOCKYARD -RUN $DOCKYARD/setup.sh +WORKDIR "$DOCKYARD" +RUN "$DOCKYARD"/setup.sh EXPOSE 6379 EXPOSE 8081 @@ -33,7 +33,7 @@ EXPOSE 8080 ENV LANG "C.UTF-8" ENV LC_ALL "C.UTF-8" -RUN chown -R 1111:1111 $DOCKYARD/ +RUN chown -R 1111:1111 "$DOCKYARD"/ USER crackq -WORKDIR $DOCKYARD/ +WORKDIR "$DOCKYARD"/ CMD ["/usr/local/bin/circusd", "/opt/crackq/build/circus.ini"]