more CI & docker tuning
This commit is contained in:
1 parent
9323db291d
commit
601bdc371a
28 files changed
+88
-45
No files matched your search
@@ -30,7 +30,7 @@ jobs:
|
||||
run: sudo apt-get update
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
|
||||
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
|
||||
|
||||
- name: Install Python dependencies
|
||||
run: pip install -r tools/requirements.txt
|
||||
@@ -60,7 +60,7 @@ jobs:
|
||||
run: sudo apt-get update
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
|
||||
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
|
||||
|
||||
- name: Install Python dependencies
|
||||
run: pip install -r tools/requirements.txt
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM archlinux:base
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
RUN pacman -Syu --noconfirm
|
||||
RUN pacman-db-upgrade
|
||||
# qt5-base skipped
|
||||
|
||||
+3
-3
@@ -5,13 +5,13 @@ if [ ! -e docker_conf.inc ]; then
|
||||
exit 1
|
||||
fi
|
||||
. docker_conf.inc
|
||||
BUILDARG="${BUILDARG:-""}"
|
||||
|
||||
# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
|
||||
UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
|
||||
if [ -n "$UART_PORT" ]; then
|
||||
UART_GID="$(stat -c '%g' $UART_PORT)"
|
||||
BUILDARG="--build-arg UART_GID=$UART_GID"
|
||||
else
|
||||
BUILDARG=""
|
||||
BUILDARG="$BUILDARG --build-arg UART_GID=$UART_GID"
|
||||
fi
|
||||
|
||||
if [ -n "$SKIPQT" ]; then
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM arm64v8/debian:trixie-slim
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# qtbase5-dev skipped
|
||||
RUN apt-get update && \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM arm32v7/debian:trixie-slim
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# qtbase5-dev skipped
|
||||
RUN apt-get update && \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM debian:trixie-slim
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && \
|
||||
apt-get upgrade -y && \
|
||||
@@ -13,9 +13,9 @@ RUN apt-get install -y opencl-dev && \
|
||||
|
||||
ARG SKIPQT=false
|
||||
RUN if [ "${SKIPQT}" = "false" ]; then \
|
||||
apt-get install -y qt6-base-dev qmake6-bin && \
|
||||
apt-get clean; \
|
||||
fi
|
||||
apt-get install -y qt6-base-dev && \
|
||||
apt-get clean; \
|
||||
fi
|
||||
|
||||
# uv
|
||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
|
||||
@@ -26,9 +26,9 @@ RUN passwd -d rrg
|
||||
ARG UART_GID
|
||||
# dialout group may already exist on another numeric ID than on host
|
||||
RUN if [ -n "${UART_GID}" ]; then \
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
|
||||
|
||||
USER rrg
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-debian-trixie:1.0
|
||||
SKIPQT=1
|
||||
#SKIPQT=1
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM debian:forky-slim
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# qtbase5-dev skipped
|
||||
RUN apt-get update && \
|
||||
@@ -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 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-debian-forky:1.0
|
||||
#SKIPQT=1
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM fedora:41
|
||||
|
||||
ENV LANG=C
|
||||
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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM fedora:42
|
||||
|
||||
ENV LANG=C
|
||||
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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM fedora:rawhide
|
||||
|
||||
ENV LANG=C
|
||||
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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM homebrew/brew
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
|
||||
ARG UART_GID
|
||||
# dialout group may already exist on another numeric ID than on host
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM kalilinux/kali-rolling
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# qtbase5-dev skipped
|
||||
RUN apt-get update && \
|
||||
@@ -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 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-kali:1.0
|
||||
#SKIPQT=1
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM opensuse/leap
|
||||
|
||||
ENV LANG=C
|
||||
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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM opensuse/tumbleweed
|
||||
|
||||
ENV LANG=C
|
||||
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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FROM parrotsec/core:latest
|
||||
|
||||
ENV LANG=C
|
||||
ENV LANG=C.UTF-8
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# qtbase5-dev skipped
|
||||
RUN apt-get update && \
|
||||
@@ -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 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-parrotsec-core-latest:1.0
|
||||
#SKIPQT=1
|
||||
@@ -10,3 +10,4 @@ if [ -n "$CONTAINER" ]; then
|
||||
docker rm $CONTAINER
|
||||
fi
|
||||
docker image rm "$DOCKER_IMAGE"
|
||||
docker builder prune --force
|
||||
@@ -1,8 +1,8 @@
|
||||
FROM ubuntu:24.04
|
||||
|
||||
ENV LANG=C
|
||||
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,20 +12,26 @@ 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/
|
||||
|
||||
# Create rrg user => there is already a ubuntu user = 1000 that we need to move away
|
||||
RUN usermod -u 999 ubuntu
|
||||
RUN groupmod -g 999 ubuntu
|
||||
RUN usermod -u 900 ubuntu
|
||||
RUN groupmod -g 900 ubuntu
|
||||
RUN useradd -ms /bin/bash rrg
|
||||
RUN passwd -d rrg
|
||||
ARG UART_GID
|
||||
# dialout group may already exist on another numeric ID than on host
|
||||
RUN if [ -n "${UART_GID}" ]; then \
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
|
||||
|
||||
USER rrg
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-ubuntu-24.04:1.0
|
||||
#SKIPQT=1
|
||||
@@ -1,8 +1,8 @@
|
||||
FROM ubuntu:25.04
|
||||
|
||||
ENV LANG=C
|
||||
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,20 +12,26 @@ 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/
|
||||
|
||||
# Create rrg user => there is already a ubuntu user = 1000 that we need to move away
|
||||
RUN usermod -u 999 ubuntu
|
||||
RUN groupmod -g 999 ubuntu
|
||||
RUN usermod -u 900 ubuntu
|
||||
RUN groupmod -g 900 ubuntu
|
||||
RUN useradd -ms /bin/bash rrg
|
||||
RUN passwd -d rrg
|
||||
ARG UART_GID
|
||||
# dialout group may already exist on another numeric ID than on host
|
||||
RUN if [ -n "${UART_GID}" ]; then \
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
groupadd -g ${UART_GID} mydialout || true; \
|
||||
usermod -aG ${UART_GID} rrg; \
|
||||
fi
|
||||
RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
|
||||
|
||||
USER rrg
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-ubuntu-25.04:1.0
|
||||
#SKIPQT=1
|
||||
@@ -1,8 +1,8 @@
|
||||
FROM ubuntu:25.10
|
||||
|
||||
ENV LANG=C
|
||||
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,12 +12,18 @@ 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/
|
||||
|
||||
# Create rrg user => there is already a ubuntu user = 1000 that we need to move away
|
||||
RUN usermod -u 999 ubuntu
|
||||
RUN groupmod -g 999 ubuntu
|
||||
RUN usermod -u 900 ubuntu
|
||||
RUN groupmod -g 900 ubuntu
|
||||
RUN useradd -ms /bin/bash rrg
|
||||
RUN passwd -d rrg
|
||||
ARG UART_GID
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-ubuntu-25.10:1.0
|
||||
#SKIPQT=1
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# Online tests that require actual PM3 device connection
|
||||
# This is used to make sure that the language for the functions is english instead of the system default language.
|
||||
LANG=C
|
||||
LANG=C.UTF-8
|
||||
|
||||
PM3PATH="$(dirname "$0")/.."
|
||||
cd "$PM3PATH" || exit 1
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
# SKIPUV=1 ./pm3_tests.sh
|
||||
|
||||
# This is used to make sure that the language for the functions is english instead of the system default language.
|
||||
LANG=C
|
||||
LANG=C.UTF-8
|
||||
|
||||
PM3PATH="$(dirname "$0")/.."
|
||||
cd "$PM3PATH" || exit 1
|
||||
|
||||
Reference in new issue
Block a user