Skip to content

Commit e694752

Browse files
joachimmetzjoachimmetz
committed
Changes to dependency writers
1 parent 808a1d9 commit e694752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+245
-538
lines changed

‎.github/workflows/test_docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
strategy:
3939
matrix:
40-
version: ['24.04']
40+
version: ['26.04']
4141
container:
4242
image: ubuntu:${{ matrix.version }}
4343
steps:

‎MANIFEST.in‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
include ACKNOWLEDGEMENTS AUTHORS LICENSE README
1+
include ACKNOWLEDGEMENTS AUTHORS LICENSE README.md
22
include dependencies.ini run_tests.py
3-
include requirements.txt test_requirements.txt
43
exclude .gitignore
54
exclude *.pyc
65
recursive-include config *
@@ -10,6 +9,5 @@ recursive-include tools *.py
109
recursive-exclude tools *.pyc
1110
recursive-include test_data *
1211
# The test scripts are not required in a binary distribution package they
13-
# are considered source distribution files and excluded in find_package()
14-
# in setup.py.
12+
# are considered source distribution files and excluded by find_package().
1513
recursive-include tests *.py

README renamed to README.md

File renamed without changes.

‎appveyor.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
environment:
22
matrix:
3-
- DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12"
3+
- DESCRIPTION: "Run tests on Windows with 32-bit Python 3.14"
44
MACHINE_TYPE: "x86"
55
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
6-
PYTHON: "C:\\Python312"
7-
PYTHON_VERSION: "3.12"
6+
PYTHON: "C:\\Python314"
7+
PYTHON_VERSION: "3.14"
88
L2TBINARIES_TRACK: "dev"
99
TARGET: tests
10-
- DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12"
10+
- DESCRIPTION: "Run tests on Windows with 64-bit Python 3.14"
1111
MACHINE_TYPE: "amd64"
1212
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
13-
PYTHON: "C:\\Python312-x64"
14-
PYTHON_VERSION: "3.12"
13+
PYTHON: "C:\\Python314-x64"
14+
PYTHON_VERSION: "3.14"
1515
L2TBINARIES_TRACK: "dev"
1616
TARGET: tests
17-
- DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12"
17+
- DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.14"
1818
MACHINE_TYPE: "amd64"
1919
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
20-
PYTHON: "C:\\Python312-x64"
21-
PYTHON_VERSION: "3.12"
20+
PYTHON: "C:\\Python314-x64"
21+
PYTHON_VERSION: "3.14"
2222
L2TBINARIES_TRACK: "dev"
2323
TARGET: wheel
24-
- DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12"
24+
- DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.14"
2525
MACHINE_TYPE: "amd64"
2626
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
27-
PYTHON: "C:\\Python312-x64"
28-
PYTHON_VERSION: "3.12"
27+
PYTHON: "C:\\Python314-x64"
28+
PYTHON_VERSION: "3.14"
2929
L2TBINARIES_TRACK: "dev"
3030
TARGET: wheel
3131
- DESCRIPTION: "Run tests on Mac OS with Python 3.14"

‎config/docker/build_dpkg.sh‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,36 @@
55
# Fail on error.
66
set -e
77

8-
GID=$(id -g);
8+
GID=$(id -g)
99

10-
L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds";
11-
GNUPG_DIRECTORY="${HOME}/Projects/l2tbuilds-gnupg";
10+
L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds"
11+
GNUPG_DIRECTORY="${HOME}/Projects/l2tbuilds-gnupg"
1212

13-
cd config/docker;
13+
cd config/docker
1414

15-
mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg";
16-
mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg-source";
15+
mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg"
16+
mkdir -p "${L2TBUILDS_DIRECTORY}/dpkg-source"
1717

1818
# Build the l2tbuilds Ubuntu Docker image.
19-
docker build -f l2tbuilds_ubuntu.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_ubuntu . ;
19+
docker build \
20+
-f l2tbuilds_ubuntu.Dockerfile \
21+
--force-rm \
22+
--no-cache \
23+
-t log2timeline/l2tbuilds_ubuntu .
2024

21-
if test -d "${GNUPG_DIRECTORY}";
25+
if test -d "${GNUPG_DIRECTORY}"
2226
then
2327
# Run the container in interactive mode ("run -it") to use gpg-agent to sign the builds
24-
docker run -it -u ${UID}:${GID} -v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu
28+
docker run \
29+
-it \
30+
-u ${UID}:${GID} \
31+
-v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" \
32+
-v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" \
33+
log2timeline/l2tbuilds_ubuntu
2534
else
26-
docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
35+
docker run \
36+
-u ${UID}:${GID} \
37+
-v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" \
38+
log2timeline/l2tbuilds_ubuntu \
39+
/bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
2740
fi
28-

‎config/docker/build_rpm.sh‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,34 @@
55
# Fail on error.
66
set -e
77

8-
GID=$(id -g);
8+
GID=$(id -g)
99

10-
L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds";
10+
L2TBUILDS_DIRECTORY="${HOME}/Projects/l2tbuilds"
1111

12-
cd config/docker;
12+
cd config/docker
1313

14-
mkdir -p "${L2TBUILDS_DIRECTORY}/rpm";
15-
mkdir -p "${L2TBUILDS_DIRECTORY}/srpm";
14+
mkdir -p "${L2TBUILDS_DIRECTORY}/rpm"
15+
mkdir -p "${L2TBUILDS_DIRECTORY}/srpm"
1616

1717
# Build the l2tbuilds Fedora Docker image.
18-
docker build -f l2tbuilds_fedora.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_fedora . ;
19-
docker run -it -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_fedora /bin/bash
18+
docker build \
19+
--build-arg GID=${GID} \
20+
--build-arg UID=${UID} \
21+
-f l2tbuilds_fedora.Dockerfile \
22+
--force-rm \
23+
--no-cache \
24+
-t log2timeline/l2tbuilds_fedora \
25+
.
2026

21-
# docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_fedora /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
27+
docker run \
28+
-it \
29+
-u ${UID}:${GID} \
30+
-v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" \
31+
log2timeline/l2tbuilds_fedora \
32+
/bin/bash
33+
34+
# docker run \
35+
# -u ${UID}:${GID}
36+
# -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z"
37+
# log2timeline/l2tbuilds_fedora
38+
# /bin/bash -c "(cd l2tdevtools && ./utils/build_rpm.sh --preset plaso)"

‎config/docker/l2tbuilds_fedora.Dockerfile‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
FROM fedora:42
1+
FROM fedora:43
22

33
# Create container with:
44
# docker build -f l2tbuilds_fedora.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_fedora .
55

6+
ARG UID=1000
7+
ARG GID=1000
8+
69
RUN dnf install -y \
710
@development-tools \
811
autoconf \
@@ -22,6 +25,12 @@ RUN dnf install -y \
2225
python3-setuptools \
2326
python3-wheel
2427

28+
RUN groupadd --gid ${GID} build && \
29+
useradd --create-home --gid ${GID} --shell /bin/bash --uid ${UID} build
30+
2531
# Set up the l2tdevtools source and build directories
26-
WORKDIR /home/build/
32+
WORKDIR /home/build
33+
34+
USER build
35+
2736
RUN git clone https://github.com/log2timeline/l2tdevtools.git

‎config/docker/l2tbuilds_ubuntu.Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ RUN apt-get -y update && \
1111
apt-get -y install apt-transport-https apt-utils && \
1212
apt-get -y install libterm-readline-gnu-perl software-properties-common && \
1313
apt-get -y upgrade && \
14+
apt-get -y install \
15+
locales \
16+
pinentry-tty && \
1417
apt-get -y install --no-install-recommends \
1518
autoconf \
1619
automake \
@@ -38,9 +41,7 @@ RUN apt-get -y update && \
3841
libssl-dev \
3942
libtool \
4043
libyaml-dev \
41-
locales \
4244
pkg-config \
43-
pinentry-tty \
4445
pybuild-plugin-pyproject \
4546
python3-all \
4647
python3-all-dev \
@@ -63,16 +64,16 @@ RUN apt-get -y update && \
6364
tox-current-env && \
6465
apt-get clean && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
6566

66-
# Set terminal to UTF-8 by default
67-
RUN locale-gen en_US.UTF-8
68-
RUN update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
67+
# Set terminal to UTF-8 by default and changes pinentry to use TTY
68+
RUN locale-gen en_US.UTF-8 && \
69+
update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 && \
70+
update-alternatives --set pinentry /usr/bin/pinentry-tty
6971
ENV LANG=en_US.UTF-8
7072
ENV LC_ALL=en_US.UTF-8
7173

72-
# Changes pinentry to use TTY
73-
RUN update-alternatives --set pinentry /usr/bin/pinentry-tty
74-
7574
# Set up the l2tdevtools source and build directories
76-
USER ubuntu
7775
WORKDIR /home/ubuntu
76+
77+
USER ubuntu
78+
7879
RUN git clone https://github.com/log2timeline/l2tdevtools.git

‎data/dpkg_templates/mans-to-es-rules‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎data/pyinstaller/make_release.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ New-Item -ItemType "directory" -Path "${DistPath}\licenses"
191191
Copy-Item -Force ACKNOWLEDGEMENTS "${DistPath}"
192192
Copy-Item -Force AUTHORS "${DistPath}"
193193
Copy-Item -Force LICENSE "${DistPath}"
194-
Copy-Item -Force README "${DistPath}"
194+
Copy-Item -Force README.md "${DistPath}"
195195

196196
Copy-Item -Force -Recurse "dist\image_export\*" "${DistPath}"
197197
Copy-Item -Force -Recurse "dist\log2timeline\*" "${DistPath}"

0 commit comments

Comments
 (0)