Compare commits

...

2 commits

Author SHA1 Message Date
Marco Ochse
8162ce2571
Pin poetry==1.8.3
Multi-arch builds for log4pot are currently only working when pinning `poetry==1.8.3`.
As reported pipeline did not push images to registries (#1736)
2025-01-15 16:23:06 +01:00
Marco Ochse
4917c42fbc
Fix Debian download link 2025-01-15 10:39:12 +01:00
2 changed files with 8 additions and 8 deletions

View file

@ -326,7 +326,7 @@ Once you are familiar with how things work you should choose a network you suspe
| Distribution Name | x64 | arm64 | | Distribution Name | x64 | arm64 |
| :--------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------------------------------------------------- | | :--------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------------------------------------------------- |
| [Alma Linux OS 9.5 Boot ISO](https://almalinux.org) | [download](https://repo.almalinux.org/almalinux/9.5/isos/x86_64/AlmaLinux-9.5-x86_64-boot.iso) | [download](https://repo.almalinux.org/almalinux/9.5/isos/aarch64/AlmaLinux-9.5-aarch64-boot.iso) | | [Alma Linux OS 9.5 Boot ISO](https://almalinux.org) | [download](https://repo.almalinux.org/almalinux/9.5/isos/x86_64/AlmaLinux-9.5-x86_64-boot.iso) | [download](https://repo.almalinux.org/almalinux/9.5/isos/aarch64/AlmaLinux-9.5-aarch64-boot.iso) |
| [Debian 12 Network Install](https://www.debian.org/CD/netinst/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.8.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.8.0-arm64-netinst.iso) | | [Debian 12 Network Install](https://www.debian.org/CD/netinst/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.9.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.9.0-arm64-netinst.iso) |
| [Fedora Server 41 Network Install](https://fedoraproject.org/server/download) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-netinst-x86_64-41-1.4.iso) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-netinst-aarch64-41-1.4.iso) | | [Fedora Server 41 Network Install](https://fedoraproject.org/server/download) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-netinst-x86_64-41-1.4.iso) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-netinst-aarch64-41-1.4.iso) |
| [OpenSuse Tumbleweed Network Image](https://get.opensuse.org/tumbleweed/#download) | [download](https://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso) | [download](https://download.opensuse.org/ports/aarch64/tumbleweed/iso/openSUSE-Tumbleweed-NET-aarch64-Current.iso) | | [OpenSuse Tumbleweed Network Image](https://get.opensuse.org/tumbleweed/#download) | [download](https://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso) | [download](https://download.opensuse.org/ports/aarch64/tumbleweed/iso/openSUSE-Tumbleweed-NET-aarch64-Current.iso) |
| [Rocky Linux OS 9.5 Boot ISO](https://rockylinux.org/download) | [download](https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-minimal.iso) | [download](https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-minimal.iso) | | [Rocky Linux OS 9.5 Boot ISO](https://rockylinux.org/download) | [download](https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-minimal.iso) | [download](https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-minimal.iso) |

View file

@ -3,7 +3,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# #
# Install packages # Install packages
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y \ apt-get install -y \
build-essential \ build-essential \
cargo \ cargo \
@ -21,21 +21,21 @@ RUN apt-get update -y && \
python3-dev \ python3-dev \
rust-all && \ rust-all && \
pip3 install --no-cache-dir --break-system-packages \ pip3 install --no-cache-dir --break-system-packages \
poetry \ poetry==1.8.3 \
pycurl && \ pycurl && \
# #
# Install log4pot from GitHub and setup # Install log4pot from GitHub and setup
mkdir -p /opt /var/log/log4pot && \ mkdir -p /opt /var/log/log4pot && \
cd /opt/ && \ cd /opt/ && \
git clone https://github.com/thomaspatzke/Log4Pot && \ git clone https://github.com/thomaspatzke/Log4Pot && \
cd Log4Pot && \ cd Log4Pot && \
git checkout 5002b1fe0f82359ef32dbc3a899e8a701dc3256e && \ git checkout 5002b1fe0f82359ef32dbc3a899e8a701dc3256e && \
sed -i 's#"type": logtype,#"reason": logtype,#g' log4pot-server.py && \ sed -i 's#"type": logtype,#"reason": logtype,#g' log4pot-server.py && \
poetry --no-cache --without=dev install && \ poetry --no-cache --without=dev install && \
setcap cap_net_bind_service=+ep $(readlink -f $(which python3)) && \ setcap cap_net_bind_service=+ep $(readlink -f $(which python3)) && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup --gid 2000 log4pot && \ addgroup --gid 2000 log4pot && \
adduser --system --no-create-home --shell /bin/bash -uid 2000 --disabled-password --disabled-login -gid 2000 log4pot && \ adduser --system --no-create-home --shell /bin/bash -uid 2000 --disabled-password --disabled-login -gid 2000 log4pot && \
chown log4pot:log4pot -R /opt/Log4Pot && \ chown log4pot:log4pot -R /opt/Log4Pot && \
# #