all: cleanups

This commit is contained in:
Markus F.X.J. Oberhumer
2023-01-14 08:37:22 +01:00
parent 58de07629e
commit cc994326a0
21 changed files with 1030 additions and 868 deletions
@@ -6,10 +6,10 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
# create the image from Dockerfile
# using a rootless Podman container
# NOTE: this image is based on rebuild-stubs-with-upx/upx-stubtools-20221212-v2,
# NOTE: this image is based on rebuild-stubs-with-upx/upx-stubtools-20221212-v3,
# so you have to create that image first
# WARNING: we install many packages, so the resulting image needs A LOT of disk space!
image=upx-cross-compile-20221212-v2
image=upx-cross-compile-20230115-v1
podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
# run an interactive shell in the image
# using a rootless Podman container
image=upx-cross-compile-20221212-v2
image=upx-cross-compile-20230115-v1
flags=( -ti --read-only --rm )
flags+=( --cap-drop=all ) # drop all capabilities
@@ -1,8 +1,8 @@
# NOTE: this image is based on rebuild-stubs-with-upx/upx-stubtools-20221212-v2,
# NOTE: this image is based on rebuild-stubs-with-upx/upx-stubtools-20221212-v3,
# so you have to create that image first
# WARNING: we install many packages, so the resulting image needs A LOT of disk space!
FROM localhost/upx-stubtools-20221212-v2
ENV UPX_CONTAINER_IMAGE_NAME=upx-cross-compile-20221212-v2
FROM localhost/upx-stubtools-20221212-v3
ENV UPX_CONTAINER_IMAGE_NAME=upx-cross-compile-20230115-v1
ARG DEBIAN_FRONTEND=noninteractive
USER root
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
# create the image from Dockerfile
# using a rootless Podman container
image=upx-stubtools-20221212-v2
image=upx-stubtools-20221212-v3
podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
# run an interactive shell in the image
# using a rootless Podman container
image=upx-stubtools-20221212-v2
image=upx-stubtools-20221212-v3
flags=( -ti --read-only --rm )
flags+=( --cap-drop=all ) # drop all capabilities
+4 -3
View File
@@ -1,5 +1,5 @@
FROM docker.io/library/ubuntu:22.04
ENV UPX_CONTAINER_IMAGE_NAME=upx-stubtools-20221212-v2
ENV UPX_CONTAINER_IMAGE_NAME=upx-stubtools-20221212-v3
ARG DEBIAN_FRONTEND=noninteractive
ENV LANG=C.UTF-8
@@ -13,8 +13,9 @@ RUN dpkg --add-architecture i386 \
# the following packages are not required for rebuilding the stubs, but
# they do make the image much more convenient and also allow building
# the full UPX binary inside the container via CMake:
7zip bzip2 cmake elfutils file g++ gdb htop libzstd-dev lzip lzop ninja-build \
p7zip patch patchelf pax-utils rsync screen unzip vim zip zlib1g-dev zsh zstd \
7zip bfs bzip2 cmake elfutils fd-find file fzf g++ gdb htop hyperfine \
libzstd-dev lzip lzop ninja-build p7zip patch patchelf pax-utils ripgrep \
rsync screen universal-ctags unzip vim zip zlib1g-dev zsh zstd \
# extra packages for compiling with "gcc -m32" and and "gcc -mx32":
gcc-multilib g++-multilib \
&& true