Skip to content

Commit bf52582

Browse files
joachimmetzjoachimmetz
authored
Changes to use apt instead of apt-get (#1272)
1 parent b4f7853 commit bf52582

9 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎config/docker/l2tbuilds_fedora.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:43
1+
FROM fedora:44
22

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

‎config/docker/l2tbuilds_ubuntu.Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ FROM ubuntu:resolute
55

66
ENV DEBIAN_FRONTEND=noninteractive
77

8-
# Combining the apt-get commands into a single run reduces the size of the resulting image.
9-
# The apt-get installations below are interdependent and need to be done in sequence.
10-
RUN apt-get -y update && \
11-
apt-get -y install apt-transport-https apt-utils && \
12-
apt-get -y install libterm-readline-gnu-perl software-properties-common && \
13-
apt-get -y upgrade && \
14-
apt-get -y install \
8+
# Combining the apt commands into a single run reduces the size of the resulting image.
9+
# The apt installations below are interdependent and need to be done in sequence.
10+
RUN apt -y update && \
11+
apt -y install apt-transport-https apt-utils && \
12+
apt -y install libterm-readline-gnu-perl software-properties-common && \
13+
apt -y upgrade && \
14+
apt -y install \
1515
locales \
1616
pinentry-tty && \
17-
apt-get -y install --no-install-recommends \
17+
apt -y install --no-install-recommends \
1818
autoconf \
1919
automake \
2020
autopoint \
@@ -63,7 +63,7 @@ RUN apt-get -y update && \
6363
python3-wheel \
6464
quilt \
6565
tox-current-env && \
66-
apt-get clean && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
66+
apt clean && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
6767

6868
# Set terminal to UTF-8 by default and changes pinentry to use TTY
6969
RUN locale-gen en_US.UTF-8 && \

‎data/templates/github_actions/lint.yml/header.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
env:
3232
DEBIAN_FRONTEND: noninteractive
3333
run: |
34-
apt-get update -q
35-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
34+
apt update -q
35+
apt install -y libterm-readline-gnu-perl locales software-properties-common
3636
locale-gen en_US.UTF-8
3737
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
3838
- name: Install dependencies
@@ -42,8 +42,8 @@ jobs:
4242
add-apt-repository -y universe
4343
add-apt-repository -y ppa:deadsnakes/ppa
4444
add-apt-repository -y ppa:gift/dev
45-
apt-get update -q
46-
apt-get install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
45+
apt update -q
46+
apt install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
4747
- name: Run linter
4848
env:
4949
LANG: en_US.UTF-8

‎data/templates/github_actions/test_docker.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: ['43']
10+
version: ['44']
1111
container:
1212
image: registry.fedoraproject.org/fedora:$${{ matrix.version }}
1313
steps:
@@ -46,15 +46,15 @@ jobs:
4646
env:
4747
DEBIAN_FRONTEND: noninteractive
4848
run: |
49-
apt-get update -q
50-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
49+
apt update -q
50+
apt install -y libterm-readline-gnu-perl locales software-properties-common
5151
locale-gen en_US.UTF-8
5252
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
5353
- name: Install dependencies
5454
run: |
5555
add-apt-repository -y ppa:gift/dev
56-
apt-get update -q
57-
apt-get install -y build-essential ${dpkg_dependencies}
56+
apt update -q
57+
apt install -y build-essential ${dpkg_dependencies}
5858
- name: Run tests
5959
env:
6060
LANG: en_US.UTF-8

‎data/templates/github_actions/test_docs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
env:
2323
DEBIAN_FRONTEND: noninteractive
2424
run: |
25-
apt-get update -q
26-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
25+
apt update -q
26+
apt install -y libterm-readline-gnu-perl locales software-properties-common
2727
locale-gen en_US.UTF-8
2828
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
2929
- name: Install dependencies
@@ -33,8 +33,8 @@ jobs:
3333
add-apt-repository -y universe
3434
add-apt-repository -y ppa:deadsnakes/ppa
3535
add-apt-repository -y ppa:gift/dev
36-
apt-get update -q
37-
apt-get install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
36+
apt update -q
37+
apt install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
3838
- name: Run tests
3939
env:
4040
LANG: en_US.UTF-8

‎data/templates/github_actions/test_tox.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
env:
3333
DEBIAN_FRONTEND: noninteractive
3434
run: |
35-
apt-get update -q
36-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
35+
apt update -q
36+
apt install -y libterm-readline-gnu-perl locales software-properties-common
3737
locale-gen en_US.UTF-8
3838
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
3939
- name: Install dependencies
@@ -43,8 +43,8 @@ jobs:
4343
add-apt-repository -y universe
4444
add-apt-repository -y ppa:deadsnakes/ppa
4545
add-apt-repository -y ppa:gift/dev
46-
apt-get update -q
47-
apt-get install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
46+
apt update -q
47+
apt install -y build-essential git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
4848
- name: Run tests
4949
env:
5050
LANG: en_US.UTF-8
@@ -63,8 +63,8 @@ jobs:
6363
env:
6464
DEBIAN_FRONTEND: noninteractive
6565
run: |
66-
apt-get update -q
67-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
66+
apt update -q
67+
apt install -y libterm-readline-gnu-perl locales software-properties-common
6868
locale-gen en_US.UTF-8
6969
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
7070
- name: Install dependencies
@@ -74,8 +74,8 @@ jobs:
7474
add-apt-repository -y universe
7575
add-apt-repository -y ppa:deadsnakes/ppa
7676
add-apt-repository -y ppa:gift/dev
77-
apt-get update -q
78-
apt-get install -y build-essential curl git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
77+
apt update -q
78+
apt install -y build-essential curl git ${dpkg_dev_dependencies} python$${{ matrix.python-version }} python$${{ matrix.python-version }}-dev python$${{ matrix.python-version }}-venv ${dpkg_dependencies}
7979
- name: Run tests with coverage
8080
env:
8181
LANG: en_US.UTF-8

‎data/templates/linux_scripts/ubuntu_install_project.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ ${development_dependencies}
2727
${debug_dependencies}
2828

2929
sudo add-apt-repository ppa:gift/$${GIFT_PPA_TRACK} -y
30-
sudo apt-get update -q
31-
sudo apt-get install -q -y $${PYTHON_DEPENDENCIES}
30+
sudo apt update -q
31+
sudo apt install -q -y $${PYTHON_DEPENDENCIES}
3232

3333
if [[ "$$*" =~ "include-debug" ]];
3434
then
35-
sudo apt-get install -q -y $${DEBUG_DEPENDENCIES}
35+
sudo apt install -q -y $${DEBUG_DEPENDENCIES}
3636
fi
3737

3838
if [[ "$$*" =~ "include-development" ]];
3939
then
40-
sudo apt-get install -q -y $${DEVELOPMENT_DEPENDENCIES}
40+
sudo apt install -q -y $${DEVELOPMENT_DEPENDENCIES}
4141
fi
4242

4343
if [[ "$$*" =~ "include-test" ]];
4444
then
45-
sudo apt-get install -q -y $${TEST_DEPENDENCIES}
45+
sudo apt install -q -y $${TEST_DEPENDENCIES}
4646
fi

‎l2tdevtools/lib/definitions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""The l2tdevtools definitions."""
22

33
# The default Fedora distribution
4-
DEFAULT_FEDORA_DISTRIBUTION = "43"
4+
DEFAULT_FEDORA_DISTRIBUTION = "44"
55

66
# The default Ubuntu distribution
77
DEFAULT_UBUNTU_DISTRIBUTION = "resolute"

‎tests/download_helpers/github.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class LibyalGitHubReleasesDownloadHelperTest(test_lib.BaseTestCase):
104104
_PROJECT_ORGANIZATION = "libyal"
105105
_PROJECT_NAME = "libevt"
106106
_PROJECT_STATUS = "alpha"
107-
_PROJECT_VERSION = "20240421"
107+
_PROJECT_VERSION = "20260523"
108108

109109
@classmethod
110110
def setUpClass(cls):

0 commit comments

Comments
 (0)