docker updates
This commit is contained in:
1 parent
601bdc371a
commit
9d97588c84
20 files changed
+73
-15
No files matched your search
+1
-1
@@ -319,7 +319,7 @@ PM3INCLUDES += $(PYTHONLIBINC)
|
|||||||
## QT6 (or QT5 fallback) (optional)
|
## QT6 (or QT5 fallback) (optional)
|
||||||
ifneq ($(SKIPQT),1)
|
ifneq ($(SKIPQT),1)
|
||||||
# Check for correctly configured Qt6
|
# 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)
|
QTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs Qt6Core Qt6Widgets 2>/dev/null)
|
||||||
MOC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/moc
|
MOC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/moc
|
||||||
UIC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/uic
|
UIC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/uic
|
||||||
|
|||||||
@@ -3,13 +3,18 @@ FROM archlinux:base
|
|||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
RUN pacman -Syu --noconfirm
|
RUN pacman -Syu --noconfirm
|
||||||
RUN pacman-db-upgrade
|
RUN pacman-db-upgrade
|
||||||
# qt5-base skipped
|
|
||||||
# bluez skipped, can't be installed in docker
|
# 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
|
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
|
# OpenCL for hitag2crack
|
||||||
RUN pacman -S --noconfirm ocl-icd
|
RUN pacman -S --noconfirm ocl-icd
|
||||||
|
|
||||||
|
ARG SKIPQT=false
|
||||||
|
RUN if [ "${SKIPQT}" = "false" ]; then \
|
||||||
|
pacman -S --noconfirm qt6-base; \
|
||||||
|
fi
|
||||||
|
|
||||||
# Create rrg user
|
# Create rrg user
|
||||||
RUN useradd -ms /bin/bash rrg
|
RUN useradd -ms /bin/bash rrg
|
||||||
RUN passwd -d rrg
|
RUN passwd -d rrg
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-arch:1.0
|
DOCKER_IMAGE=pm3-arch:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -2,7 +2,7 @@ FROM arm64v8/debian:trixie-slim
|
|||||||
|
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# qtbase5-dev skipped
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get dist-upgrade -y && \
|
apt-get dist-upgrade -y && \
|
||||||
@@ -12,6 +12,12 @@ RUN apt-get update && \
|
|||||||
RUN apt-get install -y opencl-dev && \
|
RUN apt-get install -y opencl-dev && \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
|
ARG SKIPQT=false
|
||||||
|
RUN if [ "${SKIPQT}" = "false" ]; then \
|
||||||
|
apt-get install -y qt6-base-dev && \
|
||||||
|
apt-get clean; \
|
||||||
|
fi
|
||||||
|
|
||||||
# uv
|
# uv
|
||||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
DOCKER_IMAGE=pm3-debian-trixie-arm64:1.0
|
DOCKER_IMAGE=pm3-debian-trixie-arm64:1.0
|
||||||
DOCKER_PLATFORM="--platform linux/arm64"
|
DOCKER_PLATFORM="--platform linux/arm64"
|
||||||
|
SKIPQT=1
|
||||||
@@ -2,7 +2,7 @@ FROM arm32v7/debian:trixie-slim
|
|||||||
|
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# qtbase5-dev skipped
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get dist-upgrade -y && \
|
apt-get dist-upgrade -y && \
|
||||||
@@ -12,6 +12,12 @@ RUN apt-get update && \
|
|||||||
RUN apt-get install -y opencl-dev && \
|
RUN apt-get install -y opencl-dev && \
|
||||||
apt-get clean
|
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
|
# uv not available
|
||||||
#COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
#COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
||||||
RUN apt-get install -y pipx && \
|
RUN apt-get install -y pipx && \
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
DOCKER_IMAGE=pm3-debian-trixie-armhf:1.0
|
DOCKER_IMAGE=pm3-debian-trixie-armhf:1.0
|
||||||
DOCKER_PLATFORM="--platform linux/arm/v7"
|
DOCKER_PLATFORM="--platform linux/arm/v7"
|
||||||
|
SKIPQT=1
|
||||||
@@ -2,7 +2,7 @@ FROM debian:forky-slim
|
|||||||
|
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# qtbase5-dev skipped
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get dist-upgrade -y && \
|
apt-get dist-upgrade -y && \
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
FROM fedora:41
|
FROM fedora:41
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
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 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 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
|
RUN yum -y install mesa-libOpenCL ocl-icd-devel
|
||||||
|
|
||||||
# uv
|
# uv
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-fedora-41:1.0
|
DOCKER_IMAGE=pm3-fedora-41:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -1,12 +1,17 @@
|
|||||||
FROM fedora:42
|
FROM fedora:42
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
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 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 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
|
# uv
|
||||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-fedora-42:1.0
|
DOCKER_IMAGE=pm3-fedora-42:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
FROM fedora:rawhide
|
FROM fedora:rawhide
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
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 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 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
|
RUN yum -y install mesa-libOpenCL ocl-icd-devel
|
||||||
|
|
||||||
# uv
|
# uv
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-fedora-43:1.0
|
DOCKER_IMAGE=pm3-fedora-43:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -2,7 +2,7 @@ FROM kalilinux/kali-rolling
|
|||||||
|
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# qtbase5-dev skipped
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get dist-upgrade -y && \
|
apt-get dist-upgrade -y && \
|
||||||
|
|||||||
@@ -1,14 +1,25 @@
|
|||||||
FROM opensuse/leap
|
FROM opensuse/leap
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
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 && \
|
RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/15.6/home:wkazubski.repo && \
|
||||||
zypper --gpg-auto-import-keys refresh && \
|
zypper --gpg-auto-import-keys refresh && \
|
||||||
zypper --non-interactive install cross-arm-none-eabi-gcc15 cross-arm-none-eabi-newlib
|
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
|
# uv
|
||||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-suse-leap:1.0
|
DOCKER_IMAGE=pm3-suse-leap:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
FROM opensuse/tumbleweed
|
FROM opensuse/tumbleweed
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
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 --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 && \
|
#RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/openSUSE_Tumbleweed/home:wkazubski.repo && \
|
||||||
# zypper --gpg-auto-import-keys refresh && \
|
# zypper --gpg-auto-import-keys refresh && \
|
||||||
# zypper --non-interactive install cross-arm-none-eabi-gcc15 cross-arm-none-eabi-newlib
|
# zypper --non-interactive install cross-arm-none-eabi-gcc15 cross-arm-none-eabi-newlib
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
DOCKER_IMAGE=pm3-suse-tumbleweed:1.0
|
DOCKER_IMAGE=pm3-suse-tumbleweed:1.0
|
||||||
|
#SKIPQT=1
|
||||||
@@ -2,7 +2,7 @@ FROM parrotsec/core:latest
|
|||||||
|
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# qtbase5-dev skipped
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get dist-upgrade -y && \
|
apt-get dist-upgrade -y && \
|
||||||
|
|||||||
Reference in new issue
Block a user