docker updates

This commit is contained in:
Philippe Teuwen
2026-02-27 00:01:14 +01:00
parent 601bdc371a
commit 9d97588c84
20 changed files with 73 additions and 15 deletions
+1 -1
View File
@@ -319,7 +319,7 @@ PM3INCLUDES += $(PYTHONLIBINC)
## QT6 (or QT5 fallback) (optional)
ifneq ($(SKIPQT),1)
# Check for correctly configured Qt6
QTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags Qt6Core Qt6Widgets 2>/dev/null)
QTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags Qt6Core Qt6Widgets Qt6Gui 2>/dev/null)
QTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs Qt6Core Qt6Widgets 2>/dev/null)
MOC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/moc
UIC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/uic
+6 -1
View File
@@ -3,13 +3,18 @@ FROM archlinux:base
ENV LANG=C.UTF-8
RUN pacman -Syu --noconfirm
RUN pacman-db-upgrade
# qt5-base skipped
# bluez skipped, can't be installed in docker
RUN pacman -S --noconfirm sudo git base-devel cmake libusb readline bzip2 lz4 gd arm-none-eabi-gcc arm-none-eabi-newlib --needed
# OpenCL for hitag2crack
RUN pacman -S --noconfirm ocl-icd
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
pacman -S --noconfirm qt6-base; \
fi
# Create rrg user
RUN useradd -ms /bin/bash rrg
RUN passwd -d rrg
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-arch:1.0
#SKIPQT=1
+7 -1
View File
@@ -2,7 +2,7 @@ FROM arm64v8/debian:trixie-slim
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
@@ -12,6 +12,12 @@ RUN apt-get update && \
RUN apt-get install -y opencl-dev && \
apt-get clean
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
apt-get install -y qt6-base-dev && \
apt-get clean; \
fi
# uv
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
@@ -1,2 +1,3 @@
DOCKER_IMAGE=pm3-debian-trixie-arm64:1.0
DOCKER_PLATFORM="--platform linux/arm64"
SKIPQT=1
+7 -1
View File
@@ -2,7 +2,7 @@ FROM arm32v7/debian:trixie-slim
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
@@ -12,6 +12,12 @@ RUN apt-get update && \
RUN apt-get install -y opencl-dev && \
apt-get clean
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
apt-get install -y qt6-base-dev && \
apt-get clean; \
fi
# uv not available
#COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
RUN apt-get install -y pipx && \
@@ -1,2 +1,3 @@
DOCKER_IMAGE=pm3-debian-trixie-armhf:1.0
DOCKER_PLATFORM="--platform linux/arm/v7"
SKIPQT=1
+1 -1
View File
@@ -2,7 +2,7 @@ FROM debian:forky-slim
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
+6 -1
View File
@@ -1,11 +1,16 @@
FROM fedora:41
ENV LANG=C.UTF-8
# qt5-qtbase-devel skipped
RUN dnf install -y passwd sudo git make cmake gcc gcc-c++ arm-none-eabi-gcc-cs arm-none-eabi-newlib readline-devel bzip2-devel lz4-devel bluez-libs-devel python3-devel openssl-devel gd-devel libatomic findutils
RUN yum -y update
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
dnf install -y qt6-qtbase-devel; \
fi
RUN yum -y install mesa-libOpenCL ocl-icd-devel
# uv
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-fedora-41:1.0
#SKIPQT=1
+7 -2
View File
@@ -1,12 +1,17 @@
FROM fedora:42
ENV LANG=C.UTF-8
# qt5-qtbase-devel skipped
RUN dnf install -y passwd sudo git make cmake gcc gcc-c++ arm-none-eabi-gcc-cs arm-none-eabi-newlib readline-devel bzip2-devel lz4-devel bluez-libs-devel python3-devel openssl-devel gd-devel libatomic findutils
RUN yum -y update
RUN yum -y install mesa-libOpenCL ocl-icd-devel
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
dnf install -y qt6-qtbase-devel; \
fi
RUN yum -y install --allowerasing mesa-libOpenCL ocl-icd-devel
# uv
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-fedora-42:1.0
#SKIPQT=1
+6 -1
View File
@@ -1,11 +1,16 @@
FROM fedora:rawhide
ENV LANG=C.UTF-8
# qt5-qtbase-devel skipped
RUN dnf install -y passwd sudo git make cmake gcc gcc-c++ arm-none-eabi-gcc-cs arm-none-eabi-newlib readline-devel bzip2-devel lz4-devel bluez-libs-devel python3-devel openssl-devel gd-devel libatomic findutils
RUN yum -y update
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
dnf install -y qt6-qtbase-devel; \
fi
RUN yum -y install mesa-libOpenCL ocl-icd-devel
# uv
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-fedora-43:1.0
#SKIPQT=1
+1 -1
View File
@@ -2,7 +2,7 @@ FROM kalilinux/kali-rolling
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
+14 -3
View File
@@ -1,14 +1,25 @@
FROM opensuse/leap
ENV LANG=C.UTF-8
# libqt5-qtbase-devel skipped
RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis cmake gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel gd-devel
RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis cmake gcc15 gcc15-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel gd-devel
RUN zypper --non-interactive install ocl-icd-devel
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
zypper --non-interactive install qt6-core-devel qt6-widgets-devel; \
fi
RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/15.6/home:wkazubski.repo && \
zypper --gpg-auto-import-keys refresh && \
zypper --non-interactive install cross-arm-none-eabi-gcc15 cross-arm-none-eabi-newlib
RUN zypper --non-interactive install ocl-icd-devel
# Set GCC 15 as default, else it's GCC 7 ?!
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 100 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-15 100 && \
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-15 100 && \
update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-15 100
# uv
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-suse-leap:1.0
#SKIPQT=1
+8 -1
View File
@@ -1,9 +1,16 @@
FROM opensuse/tumbleweed
ENV LANG=C.UTF-8
# libqt5-qtbase-devel skipped
RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis cmake gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc15 cross-arm-none-newlib-devel gd-devel
RUN zypper --non-interactive install ocl-icd-devel
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
zypper --non-interactive install qt6-core-devel qt6-widgets-devel; \
fi
#RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/openSUSE_Tumbleweed/home:wkazubski.repo && \
# zypper --gpg-auto-import-keys refresh && \
# zypper --non-interactive install cross-arm-none-eabi-gcc15 cross-arm-none-eabi-newlib
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-suse-tumbleweed:1.0
#SKIPQT=1
+1 -1
View File
@@ -2,7 +2,7 @@ FROM parrotsec/core:latest
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \