Skip to content

Run apt_check before any apt operation #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AttilaGombosER merged 3 commits into from
Mar 22, 2026
Merged

Run apt_check before any apt operation #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d6619
Run apt repository check at the start of CI workflows
AttilaGombosER Mar 22, 2026
205b989
Revert "Run apt repository check at the start of CI workflows"
AttilaGombosER Mar 22, 2026
f60d516
Download script at image build
AttilaGombosER Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ ARG BUILD_ARCH=armhf

COPY apt-ci-hardening /etc/apt/apt.conf.d/99-ci-hardening
COPY --chmod=0755 retry /usr/local/bin/retry
COPY --chmod=0755 apt_check /usr/local/bin/apt_check
COPY --chmod=0755 apt_update /usr/local/bin/apt_update
COPY --chmod=0755 apt_install /usr/local/bin/apt_install
RUN apt_update && apt_install -y curl wget iproute2 netcat-openbsd && apt_check
RUN apt_update && apt_install -y curl wget iproute2 netcat-openbsd
RUN wget -O /usr/local/bin/apt_check https://raw.githubusercontent.com/EffectiveRange/infrastructure-configuration/refs/heads/main/aptrepo/repository/check_repo.sh \
&& chmod +x /usr/local/bin/apt_check
RUN apt_check

# Checks if the 'crossbuilder' user exists.
RUN if ! id crossbuilder 2>/dev/null;then \
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile-cross
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ ARG EARLY_EXIT_STEP=""

COPY apt-ci-hardening /etc/apt/apt.conf.d/99-ci-hardening
COPY --chmod=0755 retry /usr/local/bin/retry
COPY --chmod=0755 apt_check /usr/local/bin/apt_check
COPY --chmod=0755 apt_update /usr/local/bin/apt_update
COPY --chmod=0755 apt_install /usr/local/bin/apt_install
RUN apt_update && apt_install -y curl wget iproute2 netcat-openbsd && apt_check
RUN apt_update && apt_install -y curl wget iproute2 netcat-openbsd
RUN wget -O /usr/local/bin/apt_check https://raw.githubusercontent.com/EffectiveRange/infrastructure-configuration/refs/heads/main/aptrepo/repository/check_repo.sh \
&& chmod +x /usr/local/bin/apt_check
RUN apt_check

RUN groupadd -g $BUILD_GID crossbuilder
RUN useradd -d /home/crossbuilder -m -g $BUILD_GID -u $BUILD_UID -s /bin/bash crossbuilder
Expand Down
59 changes: 0 additions & 59 deletions apt_check
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build_tools/dpkgdeps_src/dpkgdeps/dpkgdeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def main():
with traceback_with_variables.printing_exc(
file_=traceback_with_variables.LoggerAsFile(logger)
):
run_in_hostroot_with_lock(build_arch, "apt_check")
deps = read_deps_json_recursive(args, pathlib.Path(args.depfiledir))
if args.list:
print(json.dumps(deps, indent=2))
Expand Down
Loading